Fix dud modular grenade visuals (#28265)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 0261bd8cadd93342faa5ba1b28f1baa672262a65..b1d260c32761f1f89b6bd974dfcecff2f7f848da 100644 (file)
--- 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 020be4e09c3de2f2f34ab264779d4d0f0dc36f24..243a030c981089db2eadbd1f0b620c61bf738a75 100644 (file)
--- 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 f23b6ec168d42c2b8591a8823d345f56212651e3..b0b12127c5949d0d3f3769f4b67d49a0d0184b96 100644 (file)
--- 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 (file)
index 0000000..1be2cbc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png differ