Cherry-picked commit 55ad9c7 from space-wizards/space-station-14/master

Simple-Station · Mar 25, 2024 · b9b074f · b9b074f
1 parent b68ed3c
commit b9b074f
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 3 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
@@ -0,0 +1,14 @@
+- type: entity
+  name: cleanades box
+  parent: BoxCardboard
+  id: BoxCleanerGrenades
+  description: A box full of cleanades.
+  components:
+  - type: StorageFill
+    contents:
+      - id: CleanerGrenade
+        amount: 4
+  - type: Sprite
+    layers:
+      - state: box
+      - state: flashbang
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -19,7 +19,8 @@
         amount: 2
       - id: Plunger
         amount: 2
-
+      - id: BoxCleanerGrenades
+
 - type: entity
   id: CrateServiceReplacementLights
   parent: CrateGenericSteel

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -63,8 +63,8 @@
     contents:
       - id: Soap #Make a soap group and pick between when i'm not lazy
       - id: SprayBottleSpaceCleaner
-      #- name: GrenadeChem
-      #- name: GrenadeChem
+      - id: CleanerGrenade
+        amount: 2
       - id: FlashlightLantern
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -223,6 +223,7 @@
         - Plunger
       components:
         - LightReplacer
+        - SmokeOnTrigger
     maxItemSize: Large
   - type: ItemMapper
     mapLayers:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -364,6 +364,23 @@
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg
 
+- type: entity
+  parent: SmokeGrenade
+  id: CleanerGrenade
+  name: cleanade
+  description: Special grenade for janitors, releasing large cloud of space cleaner foam
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/janitor.rsi
+  - type: SmokeOnTrigger
+    duration: 15
+    spreadAmount: 50
+    smokePrototype: Foam
+    solution:
+      reagents:
+      - ReagentId: SpaceCleaner
+        Quantity: 30
+
 - type: entity
   parent: SmokeGrenade
   id: TearGasGrenade

diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png
diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png
diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "primed",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png