Janitor Locker

Resources/Prototypes/_NF/Catalog/Fills/Lockers/service.yml

@@ -0,0 +1,14 @@
+- type: entity
+  id: LockerJanitorFilled
+  suffix: Filled
+  parent: LockerJanitor
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingBeltJanitorFilled
+      - id: ClothingHeadsetService
+      - id: MopItem
+      - id: BoxMousetrap
+      - id: BoxTrashbag
+      - id: BoxLightMixed
+      - id: Plunger

Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml

@@ -2,7 +2,7 @@
   parent: ClothingShoesBootsMag
   id: ClothingShoesBootsMagCombat
   name: combat magboots
-  description: combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  description: Combat magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi
@@ -42,7 +42,7 @@
   parent: ClothingShoesBootsMagCombat
   id: ClothingShoesBootsMagMercenary
   name: mercenary magboots
-  description: mercenary magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  description: Mercenary magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi
@@ -56,7 +56,7 @@
   parent: ClothingShoesBootsMagCombat
   id: ClothingShoesBootsMagPirate
   name: pirate magboots
-  description: pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  description: Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
   components:
   - type: Sprite
     sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi
@@ -66,6 +66,21 @@
   - type: Magboots
     toggleAction: ActionToggleMagbootsPirate
 
+- type: entity
+  parent: ClothingShoesBootsMag
+  id: ClothingShoesBootsMagGaloshes
+  name: galoshes magboots
+  description: Galoshes magnetic boots, often used during cleaning activity to ensure the user remains safely attached to the floor.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsGaloshes
+  - type: NoSlip
+
 - type: entity
   id: ActionToggleMagbootsCombat
   parent: ActionBaseToggleMagboots
@@ -91,4 +106,13 @@
   components:
   - type: InstantAction
     icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi, state: icon }
-    iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png
+    iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png
+
+- type: entity
+  id: ActionToggleMagbootsGaloshes
+  parent: ActionBaseToggleMagboots
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi, state: icon }
+    iconOn: _NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/icon-on.png

Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -25,3 +25,29 @@
       map: ["enum.WeldableLayers.BaseWelded"]
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
+
+# Janitor
+- type: entity
+  id: LockerJanitor
+  parent: LockerBaseSecure
+  name: janitor locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: janitor
+    stateDoorOpen: janitor_open
+    stateDoorClosed: janitor_door
+  - type: Sprite
+    sprite: _NF/Structures/Storage/closet.rsi
+    noRot: true
+    layers:
+    - state: generic
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: generic_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]

Resources/Textures/_NF/Clothing/Shoes/Boots/magboots-galoshes.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by Dvir001 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-on"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json

@@ -4,9 +4,18 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Taken from tgstation, mercenary locker is a resprited armory locker by erhardsteinhauer (discord)",
+  "copyright": "Taken from tgstation, mercenary locker is a resprited armory locker by erhardsteinhauer (discord), janitor is by SungYandy",
   "license": "CC-BY-SA-3.0",
   "states": [
+    {
+      "name": "janitor"
+    },
+    {
+      "name": "janitor_door"
+    },
+    {
+      "name": "janitor_open"
+    },
     {
       "name": "generic"
 	},
@@ -30,6 +39,9 @@
     },
     {
       "name": "welded"
+    },
+    {
+      "name": "sparking"
     }
   ]
 }