diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index 84dc0221a3..e31279df76 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -98,3 +98,42 @@ - type: ConditionalSpawner prototypes: - MobFoxRenault + +- type: entity + name: McGriff Spawner + id: SpawnMobMcGriff + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobMcGriff + +- type: entity + name: Sloth Paperwork Spawner + id: SpawnMobSlothPaperwork + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobPaperwork + +- type: entity + name: Walter Spawner + id: SpawnMobWalter + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobWalter diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index fc55a48993..0736b164e8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -387,3 +387,174 @@ - type: Grammar attributes: gender: epicene + +- type: entity + name: bingus + parent: SimpleMobBase + id: MobBingus + description: Bingus my beloved... + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/bingus.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: bingus + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + mass: 10 + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + layer: + - Opaque + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: bingus + crit: bingus_dead + dead: bingus_dead + - type: Butcherable + spawned: FoodMeat + pieces: 2 + - type: InteractionPopup + successChance: 0.9 + interactSuccessString: petting-success-cat + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/cat_meow.ogg + - type: Grammar + attributes: + gender: epicene + +- type: entity + name: mcgriff + parent: SimpleMobBase + id: MobMcGriff + description: This dog can tell something smells around here, and that something is CRIME! + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/mcgriff.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: mcgriff + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + mass: 10 + mask: + - Impassable + - MobImpassable + - SmallImpassable + - VaultImpassable + layer: + - Opaque + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: mcgriff + crit: mcgriff_dead + dead: mcgriff_dead + - type: Butcherable + spawned: FoodMeat + pieces: 2 + - type: ReplacementAccent + accent: dog + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-dog + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/small_dog_bark_happy.ogg + - type: Grammar + attributes: + proper: true + gender: male + +- type: entity + name: paperwork + parent: MobSloth + id: MobPaperwork + description: Took up a new job sorting books in the library after he got transferred from space station 13. He seems to be just as slow at this. + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/paperwork.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: paperwork + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: paperwork + crit: paperwork_dead + dead: paperwork_dead + - type: Butcherable + spawned: FoodMeat + pieces: 3 + - type: InteractionPopup + successChance: 1 + interactSuccessString: petting-success-sloth + interactFailureString: petting-failure-sloth + - type: Grammar + attributes: + proper: true + gender: male + +- type: entity + name: walter + parent: SimpleMobBase + id: MobWalter + description: He likes chems and treats. Walter. + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Pets/walter.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: walter + - type: Physics + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + mass: 10 + mask: + - Impassable + - MobImpassable + - SmallImpassable + - VaultImpassable + layer: + - Opaque + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: walter + crit: walter_dead + dead: walter_dead + - type: Butcherable + spawned: FoodMeat + pieces: 3 + - type: ReplacementAccent + accent: dog + - type: InteractionPopup + successChance: 0.7 + interactSuccessString: petting-success-dog + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/small_dog_bark_happy.ogg + - type: Grammar + attributes: + proper: true + gender: male diff --git a/Resources/Textures/Mobs/Pets/bingus.rsi/bingus.png b/Resources/Textures/Mobs/Pets/bingus.rsi/bingus.png new file mode 100644 index 0000000000..ee5e7f582f Binary files /dev/null and b/Resources/Textures/Mobs/Pets/bingus.rsi/bingus.png differ diff --git a/Resources/Textures/Mobs/Pets/bingus.rsi/bingus_dead.png b/Resources/Textures/Mobs/Pets/bingus.rsi/bingus_dead.png new file mode 100644 index 0000000000..ed2d82ea54 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/bingus.rsi/bingus_dead.png differ diff --git a/Resources/Textures/Mobs/Pets/bingus.rsi/meta.json b/Resources/Textures/Mobs/Pets/bingus.rsi/meta.json new file mode 100644 index 0000000000..6504fc432b --- /dev/null +++ b/Resources/Textures/Mobs/Pets/bingus.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Emisse in aseprite for SS14", + "states": + [ + { + "name": "bingus", + "directions": 4 + }, + + { + "name": "bingus_dead", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Mobs/Pets/mcgriff.rsi/mcgriff.png b/Resources/Textures/Mobs/Pets/mcgriff.rsi/mcgriff.png new file mode 100644 index 0000000000..f27273efd3 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/mcgriff.rsi/mcgriff.png differ diff --git a/Resources/Textures/Mobs/Pets/mcgriff.rsi/mcgriff_dead.png b/Resources/Textures/Mobs/Pets/mcgriff.rsi/mcgriff_dead.png new file mode 100644 index 0000000000..7af16dfcc1 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/mcgriff.rsi/mcgriff_dead.png differ diff --git a/Resources/Textures/Mobs/Pets/mcgriff.rsi/meta.json b/Resources/Textures/Mobs/Pets/mcgriff.rsi/meta.json new file mode 100644 index 0000000000..4d7e2b63f8 --- /dev/null +++ b/Resources/Textures/Mobs/Pets/mcgriff.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG git https://github.com/tgstation/tgstation/blob/0348b921936c4736e0a9df337c8a64a69c617d13/icons/mob/pets.dmi", + "states": + [ + { + "name": "mcgriff", + "directions": 4 + }, + + { + "name": "mcgriff_dead", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Mobs/Pets/paperwork.rsi/meta.json b/Resources/Textures/Mobs/Pets/paperwork.rsi/meta.json new file mode 100644 index 0000000000..f25a1ca36d --- /dev/null +++ b/Resources/Textures/Mobs/Pets/paperwork.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG git https://github.com/tgstation/tgstation/blob/0348b921936c4736e0a9df337c8a64a69c617d13/icons/mob/pets.dmi", + "states": + [ + { + "name": "paperwork", + "directions": 4 + }, + + { + "name": "paperwork_dead", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork.png b/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork.png new file mode 100644 index 0000000000..4eb691e109 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork.png differ diff --git a/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork_dead.png b/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork_dead.png new file mode 100644 index 0000000000..27973c6389 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/paperwork.rsi/paperwork_dead.png differ diff --git a/Resources/Textures/Mobs/Pets/walter.rsi/meta.json b/Resources/Textures/Mobs/Pets/walter.rsi/meta.json new file mode 100644 index 0000000000..75ce7ff06a --- /dev/null +++ b/Resources/Textures/Mobs/Pets/walter.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG git https://github.com/tgstation/tgstation/blob/0348b921936c4736e0a9df337c8a64a69c617d13/icons/mob/pets.dmi", + "states": + [ + { + "name": "walter", + "directions": 4 + }, + + { + "name": "walter_dead", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Mobs/Pets/walter.rsi/walter.png b/Resources/Textures/Mobs/Pets/walter.rsi/walter.png new file mode 100644 index 0000000000..29512c22cb Binary files /dev/null and b/Resources/Textures/Mobs/Pets/walter.rsi/walter.png differ diff --git a/Resources/Textures/Mobs/Pets/walter.rsi/walter_dead.png b/Resources/Textures/Mobs/Pets/walter.rsi/walter_dead.png new file mode 100644 index 0000000000..ffbfe699e3 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/walter.rsi/walter_dead.png differ