Cleaner Grenade (#25444)

* Cleaner Grenade

Added Cleaner Grenade

* Sprite update

Draw issue moment

* Removed from jani closet | added box of cleanades

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
new file mode 100644 (file)
index 0000000..37bb6b8
--- /dev/null
+++ 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
\ No newline at end of file

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 8f8c1a114fc7b9a563d3f714bcb5e77b7e25818a..141f98edab2df0cd59c51b24741a9a7e5463d87e 100644 (file)
--- 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
index 976d2a4307f16265ab98e322e7518f71cb4327be..27dd4c7e9a7db9baa89565784dc4525e2a53274b 100644 (file)
--- 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
index d3ccd335c17151a8cf899a7b74364052a4482f6f..1f90b42152601cc0a76a6f89370377b14ae43280 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -224,6 +224,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
index cd2f63976d5784d1b1f5c3cda891133afa458cb5..1cad73e30eadaab4ec48e45fbb758308be7c8d80 100644 (file)
--- 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/Items/smoke_grenade_prime.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
new file mode 100644 (file)
index 0000000..af09cd7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png
new file mode 100644 (file)
index 0000000..736e979
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json
new file mode 100644 (file)
index 0000000..28d3e69
--- /dev/null
+++ 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
new file mode 100644 (file)
index 0000000..a687c07
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png differ