Skip to content

Commit

Permalink
Merge branch 'master' into 2025-01-28-batch-lathe-jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
dvir001 authored Jan 28, 2025
2 parents 3008018 + 5f2703c commit f156343
Show file tree
Hide file tree
Showing 15 changed files with 301 additions and 282 deletions.
12 changes: 11 additions & 1 deletion Resources/Changelog/Frontier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
286 changes: 286 additions & 0 deletions Resources/Prototypes/_NF/Datasets/Names/cat.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
63 changes: 0 additions & 63 deletions Resources/Prototypes/_NF/Datasets/Names/cat_bingus.yml

This file was deleted.

Loading

0 comments on commit f156343

Please sign in to comment.