Pet Pun Pun for bartenders (#16218)

diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index 746ab9d637a6f03a53c6e30ad6b4e9f1018e3395..b5af1a5e3f5d9b21045dd088aa21dfac37e3ed84 100644 (file)
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -21,6 +21,9 @@ ghost-role-information-slimes-name = Slime
 ghost-role-information-slimes-description = An ordinary slime with no special needs or interests. He just lives.
 ghost-role-information-angry-slimes-description = Everything around you irritates your instincts, destroy them!
 
+ghost-role-information-punpun-name = Pun Pun
+ghost-role-information-punpun-description = An honorable member of the monkey society in charge of the bar and helping the bartenders in any way he can.
+
 ghost-role-information-xeno-name = Xeno
 ghost-role-information-xeno-description = You are a xeno, co-operate with your hive to kill all crewmembers!
 ghost-role-information-xeno-rules = You are an antagonist, smack, slash, and wack!

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 283b49877076b82dca9c30eeddbe5c0386c83bac..6258111f0d8e2a3a1ae49c19fcfe58eb7c9df16e 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -20,6 +20,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitJacketMonkey
+  name: bartender's jacket monkey
+  description: A decent jacket, for a decent monkey.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/punpun.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/punpun.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitBartenderPurple

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index c3da4026e55a64da377420d1f20b5d31984374d5..02dbc4e705353a232d12c968194aa10b78e9bccb 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -435,3 +435,17 @@
   - type: ConditionalSpawner
     prototypes:
       - MobAdultSlimesYellowAngry
+
+- type: entity
+  name: Pun Pun Spawner
+  id: SpawnMobMonkeyPunpun
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: monkey
+      sprite: Mobs/Animals/monkey.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMonkeyPunpun

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 22f7f461bae5b3138ef022c50add178855e32f72..d4bb45dbe5ab8ee93650f26c8e45c6ce5de2af3e 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -581,3 +581,30 @@
   - type: GhostTakeoverAvailable
   - type: Loadout
     prototypes: [ BoxingKangarooGear ]
+
+- type: entity
+  name: Pun Pun
+  parent: MobMonkey
+  id: MobMonkeyPunpun
+  description: A prominent representative of monkeys with unlimited access to alcohol.
+  components:
+  - type: GhostRole
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: ghost-role-information-punpun-name
+    description: ghost-role-information-punpun-description
+  - type: GhostTakeoverAvailable
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeat
+      amount: 3
+    - id: DrinkTequilaBottleFull
+      amount: 1
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - DoorBumpOpener
+  - type: Loadout
+    prototypes: [ MobMonkeyGear ]

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index a6ed83bdf6f1b1f7a8d89919ffd3b0099469890c..1d826b1db1b4131048cdfde947106de956d124e0 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -183,3 +183,10 @@
   id: BoxingKangarooGear
   equipment:
     gloves: ClothingHandsGlovesBoxingBlue
+
+- type: startingGear
+  id: MobMonkeyGear
+  equipment:
+    head: ClothingHeadHatTophat
+    jumpsuit: ClothingUniformJumpsuitJacketMonkey
+    id: BartenderPDA

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..534ad61
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/equipped-INNERCLOTHING-monkey.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/icon.png
new file mode 100644 (file)
index 0000000..ae6e3e2
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..7d50bd5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..fef6706
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/meta.json
new file mode 100644 (file)
index 0000000..4fe74d1
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Newty (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}