From 319b43466caa2bc85cce6ff23aa6305f86d219ea Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Tue, 9 May 2023 10:39:43 +0300 Subject: [PATCH] Pet Pun Pun for bartenders (#16218) --- .../ghost/roles/ghost-role-component.ftl | 3 ++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++++ .../Entities/Markers/Spawners/mobs.yml | 14 +++++++++ .../Prototypes/Entities/Mobs/NPCs/pets.yml | 27 ++++++++++++++++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 7 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 876 bytes .../Uniforms/Jumpsuit/punpun.rsi/icon.png | Bin 0 -> 369 bytes .../Jumpsuit/punpun.rsi/inhand-left.png | Bin 0 -> 1578 bytes .../Jumpsuit/punpun.rsi/inhand-right.png | Bin 0 -> 1145 bytes .../Uniforms/Jumpsuit/punpun.rsi/meta.json | 26 +++++++++++++++++ 10 files changed, 88 insertions(+) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/punpun.rsi/meta.json 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 746ab9d637..b5af1a5e3f 100644 --- 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 283b498770..6258111f0d 100644 --- 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 c3da4026e5..02dbc4e705 100644 --- 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 22f7f461ba..d4bb45dbe5 100644 --- 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 a6ed83bdf6..1d826b1db1 100644 --- 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 index 0000000000000000000000000000000000000000..534ad610d20de3c50aa13a42543278a494477458 GIT binary patch literal 876 zcmV-y1C#uTP)Px&3`s;mRCt{2nomm`K^Vp##ep&Mmb(6FSgVB~IqgM)2&L!T(yyWT4g3T>^w3-J zTw3Tkp_g1dhEn!c3JF1w(pYL5#JNZZnI3e)s*&!@Cfk4S@3QP9yw5xDyfb@v24EP5 zVHk#Cm|xOpG)$w>Fsmz(ky07}kW!k}mB`rNCavG=^^BC#6bc1HM5a(E7%8Rc^?F|V zQ!e7=av4N~QmF(X1c(SqDQK;6cz6h<6gr&_YPDMGxGwsYN(Eb+RRDkx5<*C5eGaY9 z0RZnmG!e(Klm4`8B3qkPgvAJ2Yt-v?Xsrp9i?YmM6l}g1)-?;-U!F&iJ!q;zI-w=NUGim?W>2$8W*Wc}< z-EO1X{e&lvp8^2lI390y3DU&AnPVE953ALc$UIms;mzCUP)dP_u(7d)h53j0{N>}= z55H0R!01EJM?ZB3SWeH5AcP!N`}p`6#pQLJd~dsk^5XRD2>0(j8cy0iPtT6L;yD)p z04~f4wzs#3??MPKabKoqERVdGKv4vxZ8I)k<3PzBm=YuD&Jd(=RSAW=lXlkgM)*KZv(4gHM8RE3|XIkcW3X`O${ltT~|rND2?5nJ-pn1<`vJW z0LjZo)~8RB$2rjN_eX9w--}sZ=IAJ@)#^>daw61fwJ9Pp&1Q2f@w^izqFWu1M*+sI zo#_y?mUIvVxlJCpoNQ7%3tk1V7ZnDB0qiqxlG;HKjO>auc&*x9V!v|>TF0000A2h literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..ae6e3e2d7661340f65446e287ba094698db2aca3 GIT binary patch literal 369 zcmV-%0gnEOP)Px$D@jB_R9J=Wld)>UFc60Slp2n}L93w{8E?gtmO?|`AY-4e&tcKGh}VLQmo83e zX(-jG;X1_>T1d{Jo4!rIxc~k;As~~mx^hB90surLb>-x6_pi-E2r`bN z5RovmSZjrug@|MvM+qUQLtJQstXCV@(jldUwr!D8f-N1^tBuy`^Z?#_X_^MiJZZLc zh%v&JZqk?;P18WL1@#6Fm}?7W#_QWK*FqPd?|XDzH=Wz3N5mL049}C+bshS?KP%8t z>dMLe-GhV>WV_u;2tk(1E2%3t>jzwF3qHSIP!u#xy4&qg-rVB-Bh2ZKg|>j1#TbK> z(xeqdf&G4u7^B)xRq$8yb3>?~003f)zcgda94q|>euP*Y(=(Y&CUXkkXPu9Nw)g=S P00000NkvXXu0mjfiwmOY literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..7d50bd5c0387f648f4fafa471d1d82136b6f7fd0 GIT binary patch literal 1578 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