From 4735cb7d2df3b54e7213913532a67f64be4ed606 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 26 May 2024 08:03:05 +1200
Subject: [PATCH] Fix dud modular grenade visuals (#28265)

---
 .../Objects/Weapons/Throwable/grenades.yml    |   3 +-
 .../Graphs/weapons/modular_grenade.yml        |  30 ++++++++++++++++--
 .../Weapons/Grenades/modular.rsi/meta.json    |   6 +++-
 .../Grenades/modular.rsi/no-trigger.png       | Bin 0 -> 347 bytes
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 0261bd8cad..b1d260c327 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -320,11 +320,12 @@
           emptyCase: { state: empty }
           wiredCase: { state: wired }
           caseWithTrigger: { state: no-payload }
+          caseWithPayload: { state: no-trigger }
           grenade: { state: complete }
       enum.Trigger.TriggerVisuals.VisualState:
         enum.ConstructionVisuals.Layer:
           Primed: { state: primed }
-          Unprimed: { state: complete }
+          # Unprimed: <Use state determined by enum.ConstructionVisuals.Layer>
   - type: StaticPrice
     price: 25
 
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
index 020be4e09c..243a030c98 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
@@ -12,7 +12,7 @@
         doAfter: 1
 
   - node: emptyCase
-    entity: ModularGrenade      
+    entity: ModularGrenade
     actions:
     - !type:AppearanceChange
     edges:
@@ -31,7 +31,7 @@
         doAfter: 2
 
   - node: wiredCase
-    entity: ModularGrenade      
+    entity: ModularGrenade
     actions:
     - !type:AppearanceChange
     - !type:PlaySound
@@ -50,6 +50,12 @@
         store: payloadTrigger
         name: Trigger
         doAfter: 0.5
+    - to: caseWithPayload
+      steps:
+      - tag: Payload
+        store: payload
+        name: Payload
+        doAfter: 0.5
 
   - node: caseWithTrigger
     actions:
@@ -71,6 +77,26 @@
         name: Payload
         doAfter: 0.5
 
+  - node: caseWithPayload
+    actions:
+    - !type:AppearanceChange
+    - !type:PlaySound
+      sound: /Audio/Machines/button.ogg
+    edges:
+    - to: wiredCase
+      steps:
+      - tool: Prying
+        doAfter: 0.5
+        completed:
+        - !type:EmptyContainer
+          container: payload
+    - to: grenade
+      steps:
+      - component: PayloadTrigger
+        store: payloadTrigger
+        name: Trigger
+        doAfter: 0.5
+
   - node: grenade
     actions:
     - !type:AppearanceChange
diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
index f23b6ec168..b0b12127c5 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept & ElectroSR",
   "size": {
     "x": 32,
     "y": 32
@@ -19,6 +19,10 @@
         "name": "no-payload",
         "directions": 1
     },
+    {
+        "name": "no-trigger",
+        "directions": 1
+    },
     {
         "name": "complete",
         "directions": 1
diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png
new file mode 100644
index 0000000000000000000000000000000000000000..1be2cbc421b2add226c928b7612c9b856a09c276
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;0I3^$B+p3WC_;A2_iie2RN2`G8GjS{a@(Q
z=H4$iF_n#H!Wzl6owH|4&)A=RU9U^#Aj{HDwiDBAYk!IOD7SO0Y<MH!z^35dc;qA}
z=OmK`okmt$qXt)I%RU85uB4<Si78X39z0n8^j2(}u=+WN)Dz4q?F>^m*=uT?c;?&f
zT^!F*VIz`Sv4yW`C8I|f!&b(Vd^Z&T&vMk`01F&g<k~G^WNa+CW$RYSB`H%DE_%Ye
zY0-lV3!Qo1+y7(OT=|3Lpb5u>V7>`++5XhtJuoB4;ERwVPtKh^+&!ACD#s<a9qO2~
iLmuooCXR#z28QMC;YapN+0q8|JA<dIpUXO@geCw%Y<n&M

literal 0
HcmV?d00001

-- 
2.51.2