diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 65786530946..5932f7d1949 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6627,7 +6627,9 @@ Entries: - author: KieueCaprie changes: - type: Add - message: It is now possible to eject ghost players from sentient PDAs via the context menu. + message: >- + It is now possible to eject ghost players from sentient PDAs via the + context menu. id: 5689 time: '2025-01-25T08:07:51.0000000+00:00' - author: Havaren @@ -6636,3 +6638,11 @@ Entries: message: Changed lifespan on candles. smalls up to 30 minuets, large up to 50 id: 5690 time: '2025-01-25T08:09:11.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: >- + Clarpy dementia made him forget he was a pirate, and he will stop + attacking everyone. + id: 5691 + time: '2025-01-27T11:35:52.0000000+00:00' diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat.yml b/Resources/Prototypes/_NF/Datasets/Names/cat.yml index 267b3c9504d..1c68a84d958 100644 --- a/Resources/Prototypes/_NF/Datasets/Names/cat.yml +++ b/Resources/Prototypes/_NF/Datasets/Names/cat.yml @@ -1,3 +1,289 @@ +- type: dataset + id: names_cat_cappy + values: + - Cappy + +- 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 + +- 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 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 diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 027d9adfeb6..45173d3d0e2 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: