diff --git a/Resources/Prototypes/Datasets/Names/N14shopkeep_cat.yml b/Resources/Prototypes/Datasets/Names/N14shopkeep_cat.yml new file mode 100644 index 00000000000..608984d7202 --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/N14shopkeep_cat.yml @@ -0,0 +1,24 @@ +- type: dataset + id: names_N14shopkeep_cat + values: + - Haggis + - Fishfood + - Texas Red + - Tato + - James A. Garfield + - Broc + - Heathcliff + - Jones + - Snarf + - Jacket + - Filbert + - Sal + - Bill + - Theodore + - John Cat + - "Shithead" + - Chili + - Greg + - Hilbert + - Peanut + - Rocks \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index c40bb139253..c8fef1b6a6a 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -633,4 +633,21 @@ - state: ai - type: ConditionalSpawner prototypes: - - N14MobRobotEyebot \ No newline at end of file + - N14MobRobotEyebot + +#Pets +- type: entity + name: Haggis the Cat Spawner + id: N14SpawnMobHaggis + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Pets/cathaggis.rsi + state: cathaggis + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobCatHaggis + diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml index 12d5c5aceba..97edf78464c 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/pets.yml @@ -16,3 +16,5 @@ Base: cathaggis Dead: Base: cathaggis_dead + - type: RandomMetadata + nameSegments: [names_N14shopkeep_cat]