Rubber gloves for janitors (#22668)

* add

* fix

* formatting..

diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl
index c12bcf5b137f94ecd7e929a107c2f4a3bd408f58..c95b292c96680e16f9666533961d886d1f07d1de 100644 (file)
--- a/Resources/Locale/en-US/forensics/fibers.ftl
+++ b/Resources/Locale/en-US/forensics/fibers.ftl
@@ -9,6 +9,7 @@ fibers-latex = latex
 fibers-nitrile = nitrile
 fibers-nanomachines = insulative nanomachine
 fibers-chameleon = holographic chameleon
+fibers-rubber = rubber
 
 fibers-purple = purple
 fibers-red = red

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
index 4c7415aa0a726cf051d296d1cad7c8d9a4182eb5..b585d34051a0b666cc86fdfde6d6ebfbeec55726 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -3,6 +3,7 @@
   startingInventory:
     ClothingUniformJumpsuitJanitor: 2
     ClothingUniformJumpskirtJanitor: 2
+    ClothingHandsGlovesJanitor: 2
     ClothingShoesColorBlack: 2
     ClothingHeadHatPurplesoft: 2
     ClothingBeltJanitor: 2

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 31debf872c977e3a4287199e5d79456e6230540f..dc1c4fcf48d11f181388e15e80fcbbcf9fc8fa92 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -391,3 +391,19 @@
   - type: GuideHelp
     guides:
     - DNA
+
+# TODO Make lubed items not slip in hands
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesJanitor
+  name: rubber gloves
+  description: High-quality rubber gloves, squeaky to do some cleaning!
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/janitor.rsi
+  - type: Fiber
+    fiberMaterial: fibers-rubber
+    fiberColor: fibers-yellow
+  - type: FingerprintMask

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
index 2b778ee6c2494c4329a13b4f4a68fc34a27b09fe..bf11532ddbf3596d67795e889ca3581b04038f6e 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -23,6 +23,7 @@
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHatPurplesoft
     id: JanitorPDA
+    gloves: ClothingHandsGlovesJanitor
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
   innerClothingSkirt: ClothingUniformJumpskirtJanitor
@@ -35,6 +36,7 @@
     jumpsuit: ClothingUniformJumpskirtJanimaid
     back: ClothingBackpackFilled
     id: JanitorPDA
+    gloves: ClothingHandsGlovesJanitor
     head: ClothingHeadHatCatEars
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled

diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png
new file mode 100644 (file)
index 0000000..914ead6
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png
new file mode 100644 (file)
index 0000000..2330f3d
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..21fe32a
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..98bf0b3
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json
new file mode 100644 (file)
index 0000000..14008ae
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Ubaser.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HAND",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file