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>

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 793a11d690f04086e8df8889c2c861f7a006a042..1c28509b2d437cf16c58b7de80aa725d3626dd62 100644 (file)
--- 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 cb5f875204bd67a4fe4b41a64a5855a121698ef9..f4cc09430a20a3df759a079c5eeef72f802804da 100644 (file)
--- 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 1964acbb02c056fa3a7acda6aa685f880752857b..44570421837514292bc3b478815550fc0a714b36 100644 (file)
--- 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 fb25e87f161683c3a88573f2d3b41fa09d04cfb4..530022424ec014eda74302d2b23bed2ec5eb8a15 100644 (file)
--- 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 29b81664391738743cfc85b6d04ea37f3cb7d245..f2f7648521893e0dc6256ff409599198625038ac 100644 (file)
--- 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 (file)
index 0000000..97a8bf5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/equipped-HELMET.png differ

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 (file)
index 0000000..22ee7db
--- /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 (file)
index 0000000..b335a9d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-left.png differ

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 (file)
index 0000000..9dd24a2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger.png b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger.png
new file mode 100644 (file)
index 0000000..7c878a3
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/golden_plunger.rsi/plunger.png differ