diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index 57a971837e8..28078f1399f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -1,4 +1,4 @@ -# Passive Animals +#MARK: Passive Animals - type: entity name: Brahmin Spawner id: N14SpawnMobBrahmin @@ -59,7 +59,82 @@ prototypes: - N14MobRadstag -# Hostile Animals +- type: entity + name: Nuclear Beaver Spawner + id: N14SpawnMobNuclearBeaver + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/beaver.rsi + state: beaver + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobNuclearBeaver + +- type: entity + name: Nuclear Opossum Spawner + id: N14SpawnMobNuclearOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: opossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobNuclearOpossum + +- type: entity + name: Nuclear Rabbit Spawner + id: N14SpawnMobNuclearRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: rabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobNuclearRabbit + +- type: entity + name: Opossum Spawner + id: N14SpawnMobOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: normopossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Normal Rabbit Spawner + id: N14SpawnMobNormRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: normrabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + +#MARK: Hostile Animals - type: entity name: Molerat Spawner id: N14SpawnMobMolerat @@ -210,7 +285,7 @@ prototypes: - N14MobYaoguai -# Scaley Animals +#MARK: Scaley Animals - type: entity name: Deathclaw Spawner id: N14SpawnMobDeathclaw @@ -256,7 +331,7 @@ prototypes: - N14MobDeathclawMetal -# Insects +#MARK: Insects - type: entity name: Bloatfly Spawner id: N14SpawnMobBloatfly @@ -408,7 +483,7 @@ - N14MobRaiderPsycho -# Ghoul +#MARK: Ghoul - type: entity name: Feral Ghoul Spawner id: N14SpawnMobFeralGhoul @@ -469,7 +544,7 @@ prototypes: - N14MobGhoulMaypole -# Robots +#MARK: Robots - type: entity name: Assaultron Spawner id: N14SpawnMobAssaultron diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml index ab10c9714a4..f6ee0b841f3 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -1234,3 +1234,141 @@ - type: HTN rootTask: task: MouseCompound + +#MARK: Beaver +- type: entity + parent: N14MobBaseSimple + id: N14MobNuclearBeaver + name: nuclear beaver + description: Wonder what kind of trees its knawed down. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: beaver + sprite: _Nuclear14/Mobs/Animals/beaver.rsi + - type: DamageStateVisuals + states: + Alive: + Base: beaver + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +#MARK: Opossum +- type: entity + parent: N14MobBaseSimple + id: N14MobNuclearOpossum + name: nuclear opossum + description: Play dead! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: opossum + sprite: _Nuclear14/Mobs/Animals/opossum.rsi + - type: DamageStateVisuals + states: + Alive: + Base: opossum + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +- type: entity + parent: N14MobBaseSimple + id: N14MobOpossum + name: opossum + description: Play dead! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: normopossum + sprite: _Nuclear14/Mobs/Animals/opossum.rsi + - type: DamageStateVisuals + states: + Alive: + Base: normopossum + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw #At some point need their own meat + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +#MARK: Rabbit +- type: entity + parent: N14MobBaseSimple + id: N14MobNuclearRabbit + name: nuclear rabbit + description: Not a cotton-tail anymore, huh. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: rabbit + sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + - type: DamageStateVisuals + states: + Alive: + Base: rabbit + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +- type: entity + parent: N14MobBaseSimple + id: N14MobRabbit + name: rabbit + description: What a sweet little cotton-tail! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: normrabbit + sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + - type: DamageStateVisuals + states: + Alive: + Base: normrabbit + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw #At some point need their own meat + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png new file mode 100644 index 00000000000..be32fdd1491 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png new file mode 100644 index 00000000000..46cd7792a86 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/meta.json new file mode 100644 index 00000000000..481212bdc1c --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by ladyayla for N14", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "beaver", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/dead.png new file mode 100644 index 00000000000..a67a0bd2ae5 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/meta.json new file mode 100644 index 00000000000..00355778007 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by ladyayla for N14", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "opossum", + "directions": 4 + }, + { + "name": "normopossum", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/normopossum.png b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/normopossum.png new file mode 100644 index 00000000000..a73df1c0876 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/normopossum.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png new file mode 100644 index 00000000000..c8a5dcb17b1 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/dead.png new file mode 100644 index 00000000000..3290de97790 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json new file mode 100644 index 00000000000..5c625881fb3 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by ladyayla for N14", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "rabbit", + "directions": 4 + }, + { + "name": "normrabbit", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png new file mode 100644 index 00000000000..d6eff8d2f90 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/rabbit.png b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/rabbit.png new file mode 100644 index 00000000000..a6977485354 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/rabbit.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png index e4c52a60758..55f43c9b3f4 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png and b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json index 63cfc9d1b9c..959ac9bb22b 100644 --- a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json @@ -4,7 +4,7 @@ "copyright": "made by ladyayla for Nuclear 14", "size": { "x": 32, - "y": 32 + "y": 64 }, "states": [ {