From 1f16933c2a9741c7e715b38cf4e1c57c2be970d2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 18 Jan 2025 00:43:17 +0200 Subject: [PATCH 1/7] Rename dog names --- .../Prototypes/_NF/Datasets/Names/{corgi.yml => dog.yml} | 2 +- .../_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename Resources/Prototypes/_NF/Datasets/Names/{corgi.yml => dog.yml} (96%) diff --git a/Resources/Prototypes/_NF/Datasets/Names/corgi.yml b/Resources/Prototypes/_NF/Datasets/Names/dog.yml similarity index 96% rename from Resources/Prototypes/_NF/Datasets/Names/corgi.yml rename to Resources/Prototypes/_NF/Datasets/Names/dog.yml index eee73beb9af..dd616ed109e 100644 --- a/Resources/Prototypes/_NF/Datasets/Names/corgi.yml +++ b/Resources/Prototypes/_NF/Datasets/Names/dog.yml @@ -1,5 +1,5 @@ - type: dataset - id: names_corgi + id: names_dog values: - Toby - Daisy diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml index e148b81f4a2..5857d7c19b2 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml @@ -136,7 +136,7 @@ id: MobCorgiGhost components: - type: RandomMetadata - nameSegments: [names_corgi] + nameSegments: [names_dog] - type: entity suffix: Ghost @@ -144,7 +144,7 @@ id: MobCorgiPuppyGhost components: - type: RandomMetadata - nameSegments: [names_corgi] + nameSegments: [names_dog] - type: Inventory speciesId: puppy From e72040072d92fe1a47ca53d5cd76e1ef86894cf7 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 18 Jan 2025 00:43:42 +0200 Subject: [PATCH 2/7] Save on names files --- .../Prototypes/_NF/Datasets/Names/cat.yml | 292 ++++++++++++++++++ .../_NF/Datasets/Names/cat_bingus.yml | 63 ---- .../_NF/Datasets/Names/cat_calico.yml | 63 ---- .../_NF/Datasets/Names/cat_cappy.yml | 4 - .../_NF/Datasets/Names/cat_caracal.yml | 46 --- .../_NF/Datasets/Names/cat_clarpy.yml | 6 - .../_NF/Datasets/Names/cat_clippy.yml | 4 - .../_NF/Datasets/Names/cat_clugg.yml | 4 - .../_NF/Datasets/Names/cat_cult.yml | 36 --- .../_NF/Datasets/Names/cat_mistake.yml | 7 - .../_NF/Datasets/Names/cat_space.yml | 44 --- 11 files changed, 292 insertions(+), 277 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_bingus.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_calico.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_cappy.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_caracal.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_clarpy.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_clugg.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml delete mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_space.yml diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat.yml b/Resources/Prototypes/_NF/Datasets/Names/cat.yml index 267b3c9504d..1cb12b0d4a2 100644 --- a/Resources/Prototypes/_NF/Datasets/Names/cat.yml +++ b/Resources/Prototypes/_NF/Datasets/Names/cat.yml @@ -1,3 +1,295 @@ +- type: dataset + id: names_cat_cappy + values: + - Cappy + +- type: dataset + id: names_cat_elcapo + values: + - El Capo + +- type: dataset + id: names_cat_clugg + values: + - Clugg + +- type: dataset + id: names_cat_clippy + values: + - Clippy + +- type: dataset + id: names_cat_clarpy + values: + - Clarrrpy + - Clarrrrpy + - Clarrrrrpy + +- type: dataset + id: names_cat_mistake + values: +# - SCP-PY-106 + - ???? + - ????? + - ?????? + +- type: dataset # Mostly names of towns that held witch trials + id: names_cat_cult + values: + # Towns + - Salem + - Valais + - Trier + - Fulda + - Berwick + - Pendle + - Würzburg + - Bamberg + - Torsåker + - Danube + - Montpezat + - Nördlingen + - Kirkwall + - Denbigh + - Tyburn + - Bamberg + - Beaumaris + - Braunschweig + - Carrickfergus + - Belvoir + # Witches + - Glamis + - Soulmother + - Leatherlips + - Kolgrim + - Dacal + - Koldings + - Balfour + - Burroughs + - Wardwell + - Guilladot + - Saenger von Mossau + +- type: dataset + id: names_cat_space + values: + - Cosmo + - Starlight + - Gravity + - Pluto + - Saturn + - Astrid + - Jupiter + - Titan + - Mars + - Celeste + - Sirius + - Milky Way + - Pandora + - Venus + - Draco + - Polaris + - Phoenix + - Zephyr + - Taurus + - Zenith + - Hyperion + - Cosmos + - Galaxy + - Nova + - Orion + - Luna + - Aurora + - Comet + - Cassiopeia + - Vega + - Eclipse + - Meteor + - Quasar + - Stardust + - Solaris + - Apollo + - Andromeda + - Pulsar + - Nebula + - Celestial + - Astro + +- type: dataset + id: names_cat_caracal + values: + - Leo + - Luna + - Sophie + - Chloe + - Jasper + - Gizmo + - Lucy + - Oscar + - Zoey + - Sam + - Rosie + - Duke + - Rusty + - Olive + - Willow + - Cody + - Gracie + - Felix + - Sadie + - Teddy + - Ruby + - Hunter + - Mocha + - Bruno + - Stella + - Ziggy + - Lulu + - Chester + - Penny + - Ollie + - Daisy + - Cleo + - Toby + - Mia + - Max + - Bella + - Simba + - Nala + - Oliver + - Milo + - Charlie + - Lily + - Rocky + +- type: dataset + id: names_cat_bingus + values: + - Cleo + - Sphynxie + - Nudie + - Wrinkle + - Baldy + - Peach + - Zara + - Gizmo + - Luna + - Sphinxster + - Elvis + - Xander + - Moxie + - Domino + - Yoda + - Zephyr + - Kiki + - Zorro + - Velvet + - Ozzy + - Tofu + - Gigi + - Muffin + - Leo + - Sansa + - Remy + - Willow + - Slinky + - Quasar + - Dobby + - Widget + - Olive + - Nimbus + - Apollo + - Ziggy + - Pixie + - Miso + - Binx + - Tulip + - Stardust + - Luna + - Spock + - Bling + - Pippin + - Vega + - Jellybean + - Gadget + - Sizzle + - Nimbus + - Jinx + - Tinkerbell + - Quark + - Perseus + - Bagel + - Twinkle + - Marmalade + - Bonsai + - Goblin + - Opal + - Gizmo + +- type: dataset + id: names_cat_calico + values: + - Callie + - Marmalade + - Patch + - Calypso + - Patches + - Cleo + - Autumn + - Ginger + - Peaches + - Trixie + - Calista + - Marigold + - Taffy + - Tinkerbell + - Domino + - Peppermint + - Butterscotch + - Paisley + - Twix + - Caramel + - Cupcake + - Whiskers + - Maple + - Pippin + - Sundance + - Marbles + - Toffee + - Harlequin + - Jellybean + - Cali + - Aurora + - Starburst + - Pudding + - Spots + - Mocha + - Nectarine + - Skittles + - Topaz + - Sprinkles + - Sherbet + - Trixie + - Marcellus + - Dottie + - Pansy + - Carmine + - Spice + - Saffron + - Nala + - Banana Bread + - Fudge + - Poppy + - Tangelo + - Harlow + - Cinnamon + - Ugly + - Penny + - S'mores + - Calico + - Sundrop + - Marlowe + - type: dataset id: names_cat values: diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_bingus.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_bingus.yml deleted file mode 100644 index f89fa8a379e..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_bingus.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: dataset - id: names_cat_bingus - values: - - Cleo - - Sphynxie - - Nudie - - Wrinkle - - Baldy - - Peach - - Zara - - Gizmo - - Luna - - Sphinxster - - Elvis - - Xander - - Moxie - - Domino - - Yoda - - Zephyr - - Kiki - - Zorro - - Velvet - - Ozzy - - Tofu - - Gigi - - Muffin - - Leo - - Sansa - - Remy - - Willow - - Slinky - - Quasar - - Dobby - - Widget - - Olive - - Nimbus - - Apollo - - Ziggy - - Pixie - - Miso - - Binx - - Tulip - - Stardust - - Luna - - Spock - - Bling - - Pippin - - Vega - - Jellybean - - Gadget - - Sizzle - - Nimbus - - Jinx - - Tinkerbell - - Quark - - Perseus - - Bagel - - Twinkle - - Marmalade - - Bonsai - - Goblin - - Opal - - Gizmo diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_calico.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_calico.yml deleted file mode 100644 index 7908210f43e..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_calico.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: dataset - id: names_cat_calico - values: - - Callie - - Marmalade - - Patch - - Calypso - - Patches - - Cleo - - Autumn - - Ginger - - Peaches - - Trixie - - Calista - - Marigold - - Taffy - - Tinkerbell - - Domino - - Peppermint - - Butterscotch - - Paisley - - Twix - - Caramel - - Cupcake - - Whiskers - - Maple - - Pippin - - Sundance - - Marbles - - Toffee - - Harlequin - - Jellybean - - Cali - - Aurora - - Starburst - - Pudding - - Spots - - Mocha - - Nectarine - - Skittles - - Topaz - - Sprinkles - - Sherbet - - Trixie - - Marcellus - - Dottie - - Pansy - - Carmine - - Spice - - Saffron - - Nala - - Banana Bread - - Fudge - - Poppy - - Tangelo - - Harlow - - Cinnamon - - Ugly - - Penny - - S'mores - - Calico - - Sundrop - - Marlowe diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_cappy.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_cappy.yml deleted file mode 100644 index d62b6a99bb4..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_cappy.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: dataset - id: names_cat_cappy - values: - - Cappy diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_caracal.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_caracal.yml deleted file mode 100644 index 877f68ec7b9..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_caracal.yml +++ /dev/null @@ -1,46 +0,0 @@ -- type: dataset - id: names_cat_caracal - values: - - Leo - - Luna - - Sophie - - Chloe - - Jasper - - Gizmo - - Lucy - - Oscar - - Zoey - - Sam - - Rosie - - Duke - - Rusty - - Olive - - Willow - - Cody - - Gracie - - Felix - - Sadie - - Teddy - - Ruby - - Hunter - - Mocha - - Bruno - - Stella - - Ziggy - - Lulu - - Chester - - Penny - - Ollie - - Daisy - - Cleo - - Toby - - Mia - - Max - - Bella - - Simba - - Nala - - Oliver - - Milo - - Charlie - - Lily - - Rocky diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_clarpy.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_clarpy.yml deleted file mode 100644 index fcd3b66014d..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_clarpy.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: dataset - id: names_cat_clarpy - values: - - Clarrrpy - - Clarrrrpy - - Clarrrrrpy diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml deleted file mode 100644 index 1be9f601480..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_clippy.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: dataset - id: names_cat_clippy - values: - - Clippy diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_clugg.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_clugg.yml deleted file mode 100644 index f43e07d87ec..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_clugg.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: dataset - id: names_cat_clugg - values: - - Clugg diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml deleted file mode 100644 index f0cf1b90b76..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml +++ /dev/null @@ -1,36 +0,0 @@ -- type: dataset # Mostly names of towns that held witch trials - id: names_cat_cult - values: - # Towns - - Salem - - Valais - - Trier - - Fulda - - Berwick - - Pendle - - Würzburg - - Bamberg - - Torsåker - - Danube - - Montpezat - - Nördlingen - - Kirkwall - - Denbigh - - Tyburn - - Bamberg - - Beaumaris - - Braunschweig - - Carrickfergus - - Belvoir - # Witches - - Glamis - - Soulmother - - Leatherlips - - Kolgrim - - Dacal - - Koldings - - Balfour - - Burroughs - - Wardwell - - Guilladot - - Saenger von Mossau diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml deleted file mode 100644 index 2b7545f445d..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_mistake.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: dataset - id: names_cat_mistake - values: -# - SCP-PY-106 - - ???? - - ????? - - ?????? \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_space.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_space.yml deleted file mode 100644 index c0c37688d79..00000000000 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_space.yml +++ /dev/null @@ -1,44 +0,0 @@ -- type: dataset - id: names_cat_space - values: - - Cosmo - - Starlight - - Gravity - - Pluto - - Saturn - - Astrid - - Jupiter - - Titan - - Mars - - Celeste - - Sirius - - Milky Way - - Pandora - - Venus - - Draco - - Polaris - - Phoenix - - Zephyr - - Taurus - - Zenith - - Hyperion - - Cosmos - - Galaxy - - Nova - - Orion - - Luna - - Aurora - - Comet - - Cassiopeia - - Vega - - Eclipse - - Meteor - - Quasar - - Stardust - - Solaris - - Apollo - - Andromeda - - Pulsar - - Nebula - - Celestial - - Astro From 804cfea9b30d4724b551b7c57d902313f9ea8ee6 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 18 Jan 2025 00:43:56 +0200 Subject: [PATCH 3/7] Add El Capo --- .../_NF/ghost/roles/ghost-role-component.ftl | 3 ++ .../_NF/Entities/Mobs/NPCs/pets.yml | 26 ++++++++++++++++++ .../_NF/Mobs/Pets/cat.rsi/crimecat.png | Bin 0 -> 1085 bytes .../Textures/_NF/Mobs/Pets/cat.rsi/meta.json | 4 +++ 4 files changed, 33 insertions(+) create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/crimecat.png diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index 6cb82602279..cb72d4fa0ca 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -25,6 +25,9 @@ ghost-role-information-cult-cat-rules = You are a [color=red][bold]Free Agent[/b ghost-role-information-cappy-name = Cappy ghost-role-information-cappy-description = Stop resisting! Certified in lethal-force and defensive tactics. +ghost-role-information-elcapo-name = El Capo +ghost-role-information-elcapo-description = Found himself in jail after years of cat crimes. + ghost-role-information-crispy-name = Crispy ghost-role-information-crispy-description = Mistakes were made. diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 027d9adfeb6..4d5a8778bc9 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -157,6 +157,32 @@ id: Cappy - type: SouthernAccent +- type: entity + name: El Capo + parent: [NFMobPet, MobBingusGhost] + id: MobCatElCapo + description: + components: + - type: Sprite + drawdepth: Mobs + sprite: _NF/Mobs/Pets/cat.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: crimecat + - type: DamageStateVisuals + states: + Alive: + Base: cavecat + - type: GhostRole + name: ghost-role-information-elcapo-name + description: ghost-role-information-elcapo-description + rules: ghost-role-information-nonantagonist-rules + - type: RandomMetadata + nameSegments: [names_cat_elcapo] + - type: NpcFactionMember + factions: + - Cat + - type: entity name: Clugg parent: [NFMobPet, MobCatCaracalGhost] diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/crimecat.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/crimecat.png new file mode 100644 index 0000000000000000000000000000000000000000..8a9f20ecb9a7e6b552674344703e970cfea9263b GIT binary patch literal 1085 zcmV-D1j74?P)Px&-AP12RCodHnLTdQKorM)ETmk5niGITOTz_%M4gH%Me0z%0V2^*a)lg%Ht6T% zxBEQn^~`wfk%9(kG+%Gt|Kp7}$R39NuRG8k=nixTx&yDqfyal3C)yn0rM=PI!|P)Mlwr9OmjKTNM#G$GyF9{o9E6#wr~Du5S(+6AF5Db#*WSGnh*%#_uuyb$dHvaRcN7HtT!fO>+LeyL)=~;mf4@ z(S7zO2X>l(qv72fHrZ+$)JZ~6aYx4XF zJ`BUpw^IW!A#CqIL^z^tRAhhDBZ3CR{|g*<8;t&b`h2K9;vv)kc7y;6{Ahx|2~9Wv zETBJz%pui+fa23XgK%hpKX~nY{^>EI6#?)y!2;03qlp2E^>;ucSZ_f91Gt6YrNwB0 zKmK0;(N;YEMQA|)Y=qOmw)(8Mz#k9}a0JtYxVG2W8z%>P%xGo+KvrLoEe!w@4jRx@ zyn<7=)46eb^(kID-wU_r?GAJYx&z&T?m%~-JJ22I4s-{)1B(vu%6c)NVspz}S=cSW zd|#ghD-7U;$5yU=4$0;uPZOWy580~lXQdd%_iIsTGdRhp`T zgRKzctj+I+Ylxf69Ohh;3yM{ms)82`h@a4Fh)3~$c7GKH@LEcuyfbu6PbGs_i^H_) zG0)mpU*uQ>jhh0-wcMBw6_DdarRQT`Lp&N8bNJ#leIc9UW{zCkWM2}K#bFq@o;HXe zoW`43fHWaBBF&SVOPZcsiU)^}A~eP{_`qe(7&+zePWCl`1PWFpYZ8$JYc|f(PLi%% zFrS!+_tTi>`=v;(^pQ_BbTq(3_KK!=jovEIvsVpz<^Z`B|NhO#iFnOmA6)sw@#xGY3=i!4x0S zjOAd@8P?CF%rA3TH%&Gtjx`^dx&1s+S%h2^pPteXq-SR5CDr$! zCOF@^uMt%fyT}t!r6v&TkKtm{6`QryFTE*6R1{Vc%wqs}No-9_ji8#?8V)_SJJ22I z4*Yix`~%W*{ASxxhU@?U01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf D$olyi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json index 3193bc67c3b..baafcf7f7c4 100644 --- a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json @@ -94,6 +94,10 @@ "name": "cattag", "directions": 4 }, + { + "name": "crimecat", + "directions": 4 + }, { "name": "cultcat", "directions": 4 From c51a93cfaf2080c86c74ed1bf36d2650ec19a8be Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 18 Jan 2025 00:48:50 +0200 Subject: [PATCH 4/7] Update pets.yml --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 4d5a8778bc9..0278d05006a 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -161,6 +161,7 @@ name: El Capo parent: [NFMobPet, MobBingusGhost] id: MobCatElCapo + description: Wanted for countless cat crimes. description: components: - type: Sprite From f2a484351ad84ff737fd8b7eb84cdc96f8dd02e0 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 18 Jan 2025 00:49:10 +0200 Subject: [PATCH 5/7] Update pets.yml --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 0278d05006a..88148557327 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -162,7 +162,6 @@ parent: [NFMobPet, MobBingusGhost] id: MobCatElCapo description: Wanted for countless cat crimes. - description: components: - type: Sprite drawdepth: Mobs From 41ad997d8cb308b5ba7080618588a0dc9a20a741 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 18 Jan 2025 00:57:22 +0200 Subject: [PATCH 6/7] Update pets.yml --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 88148557327..4ebcd2442c5 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -85,7 +85,7 @@ - type: NpcFactionMember factions: - Cat - - PirateNF + # - PirateNF Stupid cat too old to fight, also forgot he is a pirate. - type: PirateAccent - type: Speech audioParams: @@ -172,13 +172,16 @@ - type: DamageStateVisuals states: Alive: - Base: cavecat + Base: combatcat - type: GhostRole name: ghost-role-information-elcapo-name description: ghost-role-information-elcapo-description rules: ghost-role-information-nonantagonist-rules - type: RandomMetadata nameSegments: [names_cat_elcapo] + - type: AutoImplant + implants: + - TrackingImplant - type: NpcFactionMember factions: - Cat From df2a30ff3990b950fb7c2bd989c32bd4c5cf62d9 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 18 Jan 2025 01:04:50 +0200 Subject: [PATCH 7/7] Update meta.json --- Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json index baafcf7f7c4..1c9c05f91c3 100644 --- a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince | Cult cat taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/simple/pets.dmi and modified by erhardsteinhauer (discord/github)", + "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince, crimecat edited by stagnation | Cult cat taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/simple/pets.dmi and modified by erhardsteinhauer (discord/github)", "states": [ { "name": "piratecat",