From b90c6acacd25df65abffbda8edaa14ab4892f93e Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Thu, 20 Jun 2024 10:24:36 -0400 Subject: [PATCH] golden plunger (#29043) * golden plunger * Add wood material (the handle is still wood) * 52 hours --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Objects/Specific/Janitorial/janitor.yml | 30 ++++++++++++++++++ .../Loadouts/Jobs/Civilian/janitor.yml | 23 ++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 ++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../golden_plunger.rsi/equipped-HELMET.png | Bin 0 -> 223 bytes .../Janitorial/golden_plunger.rsi/meta.json | 26 +++++++++++++++ .../plunger-inhand-left.png | Bin 0 -> 265 bytes .../plunger-inhand-right.png | Bin 0 -> 264 bytes .../Janitorial/golden_plunger.rsi/plunger.png | Bin 0 -> 299 bytes 10 files changed, 88 insertions(+) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger.png diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 793a11d690..1c28509b2d 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -54,6 +54,7 @@ loadout-group-janitor-head = Janitor head loadout-group-janitor-jumpsuit = Janitor jumpsuit loadout-group-janitor-gloves = Janitor gloves loadout-group-janitor-outerclothing = Janitor outer clothing +loadout-group-janitor-plunger = Janitor plunger loadout-group-botanist-head = Botanist head loadout-group-botanist-jumpsuit = Botanist jumpsuit diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index cb5f875204..f4cc09430a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -248,6 +248,36 @@ Blunt: 3 - type: Plunger +- type: entity + name: golden plunger + id: GoldenPlunger + parent: Plunger + description: A plunger with a plastic suction cup coated in a thin layer of gold given as a token of appreciation for years of service. Still used to unclog drains. + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/golden_plunger.rsi + state: plunger + - type: Item + sprite: Objects/Specific/Janitorial/golden_plunger.rsi + heldPrefix: plunger + - type: Clothing + sprite: Objects/Specific/Janitorial/golden_plunger.rsi + slots: + - HEAD + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 0.15625" + - type: PointLight + radius: 1.5 + energy: 0.75 + color: "#ffc20e" + - type: PhysicalComposition + materialComposition: + Plastic: 50 + Gold: 10 + Wood: 25 + - type: weightedRandomEntity id: PlungerLoot weights: diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index 1964acbb02..4457042183 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -1,3 +1,12 @@ +- type: loadoutEffectGroup + id: SeniorJanitorial + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobJanitor + time: 187200 #52 hrs (1 hour per week for 1 year) + # Head - type: loadout id: JanitorHead @@ -64,3 +73,17 @@ id: JanitorWintercoat equipment: outerClothing: ClothingOuterWinterJani + +# Misc +- type: loadout + id: JanitorGoldenPlunger + equipment: JanitorGoldenPlunger + effects: + - !type:GroupLoadoutEffect + proto: SeniorJanitorial + +- type: startingGear + id: JanitorGoldenPlunger + storage: + back: + - GoldenPlunger \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index fb25e87f16..530022424e 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -331,6 +331,13 @@ loadouts: - JanitorWintercoat +- type: loadoutGroup + id: JanitorPlunger + name: loadout-group-janitor-plunger + minLimit: 0 + loadouts: + - JanitorGoldenPlunger + - type: loadoutGroup id: BotanistHead name: loadout-group-botanist-head diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 29b8166439..f2f7648521 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -110,6 +110,7 @@ - JanitorOuterClothing - Glasses - Trinkets + - JanitorPlunger - Survival - type: roleLoadout diff --git a/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..97a8bf5997c9365b9eb0b65d90f01328197c7f24 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_r3fhE&XX zdutz+}c3myJBwPIz6>Ii{d#>>y?ktF>zLRN;@+d;jkDb2AC|YX1H?F8bW| zR}<@B2R=E)qp;h-jQND#gxnvDJ{Oxy=kMRY;N?fo`;+I&S232(&yL)7*=YX-WBYHM zI?K0WH*VEO{Wt~$(69DB1QV;+D literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/meta.json new file mode 100644 index 0000000000..22ee7db3a2 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Plunger sprites taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/obj/watercloset.dmi, Helmet sprite made for ss14 by VasilisThePikachu on github, golden plunger modified from original by Ghagliiarghii on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plunger" + }, + { + "name": "plunger-inhand-left", + "directions": 4 + }, + { + "name": "plunger-inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b335a9d673bd4a49eb3efebe3bb6376818728a5b GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tu&dhE&XX zdrML1kONQa!zq$Evf++JY9?PZ(pK$cYJVa6VZ}U#M&2gJEeX?nZ`^$LKP@Y4Pu}G` zUnM36hK3nZs}*FUZ0Ffs=dYfaR_?#={PsQXCe8aCZuM=Iv-Qq3pVoY{*#3!Y+n3Yg zAw7M2_uY?qxmTpvHh*tY2X7fpP^@H@?6zRC1dgTe~DWM4f DMBrz_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9dd24a2f757477db30171cc2c73a62ef0818ab27 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tcsbhE&XX zd&`io$w8p?;lU%*&aIB9;_y#eyY-q{bhYHVg#4}Q8#dI2x%Du{C@ES0zs`8`$=L~a z(~k21wcCmM%7;v~lDU6B-#qQ;t6Mwra((Xwov=SJBC$jwPx#x%wnN4>PWqusQh#Ccc8RD{f4%hz=}9 zr#c{n7(-HO;$XjodrkFiwZc9q481*C`sq}7WBzJUs;fC{L9 zSYR?UzZH-o5|CC80HYy6lqdBYAPd{I(_xBvcxLa%4xl`tZejqqWDfv9SvYJ7ehab? zuu=WJaP9C`umswpZ$vt{*1!uYq>;~hqVZ0kss1gw1eU;Rjo#$0HP{{RECJSqDYu3; x`~H3}7rbd;PeB^_