From: Vasilis Date: Sat, 16 Dec 2023 14:34:54 +0000 (+0100) Subject: Change opossum sprites | Add new pet poppy the safety opossum (#21672) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=96539f955b6ff1cb976ec255fb8931393ac226b6;p=space-station-14.git Change opossum sprites | Add new pet poppy the safety opossum (#21672) * Its better then what we have at least? * weh2 * oops * Last of it * among us --- diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index c98de30c1f..60663785a6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2030,6 +2030,25 @@ tags: - VimPilot +- type: entity + name: possum + parent: MobPossum + suffix: Old sprite + id: MobPossumOld + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/possum_old.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: possum_old + - type: DamageStateVisuals + states: + Alive: + Base: possum_old + Dead: + Base: possum_dead_old + - type: entity name: raccoon parent: SimpleMobBase diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index f06fa6704f..9e669d7646 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -421,6 +421,48 @@ - CannotSuicide - VimPilot +- type: entity + name: Morty + parent: MobPossumMorty + id: MobPossumMortyOld + suffix: Old sprite + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/possum_old.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: possum_old + - type: DamageStateVisuals + states: + Alive: + Base: possum_old + Dead: + Base: possum_dead_old + +- type: entity + name: Poppy # the Safety Possum + parent: MobPossumMorty + id: MobPossumPoppy + description: It's an opossum, a small scavenging marsupial. It's wearing appropriate personal protective equipment. + components: + - type: Grammar + attributes: + proper: true + gender: female + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/possum.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: poppy + - type: DamageStateVisuals + states: + Alive: + Base: poppy + Dead: + Base: poppy_dead + - type: entity name: Morticia parent: MobRaccoon diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/meta.json b/Resources/Textures/Mobs/Animals/possum.rsi/meta.json index fd9ad6a836..16b2b33872 100644 --- a/Resources/Textures/Mobs/Animals/possum.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/possum.rsi/meta.json @@ -1,23 +1,27 @@ { "version": 1, - "size": - { + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/blob/c7442716b52ce4edeef5eaf5d2fc7c57a08a3f01/icons/mob/simple_animal/possum.dmi", + "size": { "x": 32, "y": 32 }, - "license": "CC-BY-NC-SA-3.0", - "copyright": "https://github.com/goonstation/goonstation/commit/c98666f47a90d106c7a154cedffc747b3769e933", - "states": - [ + "states": [ { "name": "possum", - "directions": 4, - "delays": [[1],[1],[1],[1]] + "directions": 4 }, { "name": "possum_dead", - "directions": 1, - "delays": [[1]] + "directions": 4 + }, + { + "name": "poppy", + "directions": 4 + }, + { + "name": "poppy_dead", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/poppy.png b/Resources/Textures/Mobs/Animals/possum.rsi/poppy.png new file mode 100644 index 0000000000..941d7c902a Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum.rsi/poppy.png differ diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/poppy_dead.png b/Resources/Textures/Mobs/Animals/possum.rsi/poppy_dead.png new file mode 100644 index 0000000000..ebb08a2cce Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum.rsi/poppy_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/possum.png b/Resources/Textures/Mobs/Animals/possum.rsi/possum.png index b4b5713862..975a769d07 100644 Binary files a/Resources/Textures/Mobs/Animals/possum.rsi/possum.png and b/Resources/Textures/Mobs/Animals/possum.rsi/possum.png differ diff --git a/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png b/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png index e7297e7457..7d817c9e90 100644 Binary files a/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png and b/Resources/Textures/Mobs/Animals/possum.rsi/possum_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json b/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json new file mode 100644 index 0000000000..6b969760c4 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/possum_old.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from goonstation https://github.com/goonstation/goonstation/commit/c98666f47a90d106c7a154cedffc747b3769e933", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "possum_old", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "possum_dead_old", + "directions": 1, + "delays": [[1]] + } + ] +} diff --git a/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_dead_old.png b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_dead_old.png new file mode 100644 index 0000000000..e7297e7457 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_dead_old.png differ diff --git a/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_old.png b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_old.png new file mode 100644 index 0000000000..b4b5713862 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/possum_old.rsi/possum_old.png differ