From 02678851d6aef959d98943c1249a4067083149be Mon Sep 17 00:00:00 2001 From: the-adom Date: Mon, 28 Oct 2024 22:14:32 +0000 Subject: [PATCH 1/6] added pets.yaml, added Pets texture folder, added Shopkeepers cat --- .../_Nuclear14/Entities/Mobs/NPCs/pets.yml | 17 +++++++++++++++++ .../_Nuclear14/Mobs/Pets/cathaggis.png | Bin 0 -> 2271 bytes .../_Nuclear14/Mobs/Pets/cathaggis_dead.png | Bin 0 -> 660 bytes .../_Nuclear14/Mobs/Pets/cathaggis_rest.png | Bin 0 -> 1011 bytes .../_Nuclear14/Mobs/Pets/cathaggis_sit.png | Bin 0 -> 717 bytes 5 files changed, 17 insertions(+) create mode 100644 Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml create mode 100644 Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_dead.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_rest.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_sit.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml new file mode 100644 index 00000000000..54bfe91addc --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml @@ -0,0 +1,17 @@ +#MARK: Haggis +- type: entity + name: Haggis + id: N14MobCatShopkeep + parent: MobCat + description: A little rough around the edges, but still cute as can be. + components: + - type: Sprite + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: cathaggis + - type: DamageStateVisuals + states: + Alive: + Base: cathaggis + Dead: + Base: cathaggis_dead \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.png b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.png new file mode 100644 index 0000000000000000000000000000000000000000..b26b10abd948635b982d45d2dbd1b3020b2f766a GIT binary patch literal 2271 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 literal 0 HcmV?d00001 From 9c84981521414fbedc126797471184e155e33c4b Mon Sep 17 00:00:00 2001 From: the-adom Date: Fri, 1 Nov 2024 16:07:02 +0000 Subject: [PATCH 2/6] fixed id and sprite path, hopefully --- .../_Nuclear14/Entities/Mobs/NPCs/pets.yml | 3 ++- .../Mobs/Pets/{ => cathaggis.rsi}/cathaggis.png | Bin .../Pets/{ => cathaggis.rsi}/cathaggis_dead.png | Bin .../Pets/{ => cathaggis.rsi}/cathaggis_rest.png | Bin .../Mobs/Pets/{ => cathaggis.rsi}/cathaggis_sit.png | Bin 5 files changed, 2 insertions(+), 1 deletion(-) rename Resources/Textures/_Nuclear14/Mobs/Pets/{ => cathaggis.rsi}/cathaggis.png (100%) rename Resources/Textures/_Nuclear14/Mobs/Pets/{ => cathaggis.rsi}/cathaggis_dead.png (100%) rename Resources/Textures/_Nuclear14/Mobs/Pets/{ => cathaggis.rsi}/cathaggis_rest.png (100%) rename Resources/Textures/_Nuclear14/Mobs/Pets/{ => cathaggis.rsi}/cathaggis_sit.png (100%) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml index 54bfe91addc..a322ced329f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml @@ -1,11 +1,12 @@ #MARK: Haggis - type: entity name: Haggis - id: N14MobCatShopkeep + id: N14MobCatHaggis parent: MobCat description: A little rough around the edges, but still cute as can be. components: - type: Sprite + - sprite: _Nuclear14\Mobs\Pets\cathaggis.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cathaggis diff --git a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.png b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis.png similarity index 100% rename from Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.png rename to Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis.png diff --git a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_dead.png b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis_dead.png similarity index 100% rename from Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_dead.png rename to Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis_dead.png diff --git a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_rest.png b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis_rest.png similarity index 100% rename from Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_rest.png rename to Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis_rest.png diff --git a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_sit.png b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis_sit.png similarity index 100% rename from Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis_sit.png rename to Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/cathaggis_sit.png From 464447d7fa8b557a4f5cb799b5ee53929c1cfee6 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:50:34 +0000 Subject: [PATCH 3/6] Update pets.yml --- Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml index a322ced329f..ea3985be961 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml @@ -6,7 +6,7 @@ description: A little rough around the edges, but still cute as can be. components: - type: Sprite - - sprite: _Nuclear14\Mobs\Pets\cathaggis.rsi + sprite: _Nuclear14\Mobs\Pets\cathaggis.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cathaggis @@ -15,4 +15,4 @@ Alive: Base: cathaggis Dead: - Base: cathaggis_dead \ No newline at end of file + Base: cathaggis_dead From 9468074d78a04972c56c7542ca7afb3a8ae3b976 Mon Sep 17 00:00:00 2001 From: the-adom Date: Sun, 3 Nov 2024 11:11:00 +0000 Subject: [PATCH 4/6] meta added, PLEASE BE THE FINAL ONE --- .../Mobs/Pets/cathaggis.rsi/meta.json | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json diff --git a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json new file mode 100644 index 00000000000..b505a7e49e4 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, Haggis created by adom (discord)", + "states": [ + { + "name": "cathaggis", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "cathaggis_dead", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "cathaggis_rest", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "cathaggis_sit", + "delays": [ + [ + 1 + ] + ] + } + ] +} \ No newline at end of file From 52c897a3fa92b8071509169fed29561d575431e4 Mon Sep 17 00:00:00 2001 From: the-adom Date: Sun, 3 Nov 2024 11:13:17 +0000 Subject: [PATCH 5/6] final final forrealsies this time --- Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json index b505a7e49e4..9b0e1bda726 100644 --- a/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, Haggis created by adom (discord)", + "copyright": "Haggis created by adom (discord)", "states": [ { "name": "cathaggis", From 4af755480251b0f00f2c547ce47b3d6445617335 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:23:13 +0000 Subject: [PATCH 6/6] Update pets.yml --- Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml index ea3985be961..12d5c5aceba 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml @@ -6,7 +6,7 @@ description: A little rough around the edges, but still cute as can be. components: - type: Sprite - sprite: _Nuclear14\Mobs\Pets\cathaggis.rsi + sprite: _Nuclear14/Mobs/Pets/cathaggis.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cathaggis