Light Up Landmines (#38092)

* Adjust landmines to have unshaded lights.

* Someday I will give myself credit for the work I do.

* Adjust animation speed.

diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index 125245301964c5b9cafb3b7a5e8bd7f31cefac02..7ed1b657ea2701998ac247f10c79ab721fab9161 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -27,15 +27,17 @@
     drawdepth: Items
     sprite: Objects/Misc/landmine.rsi
     layers:
-    - state: landmine-inactive
+    - state: landmine
+    - state: landmine-unshaded
+      shader: unshaded
       map: [ "enum.ToggleableVisuals.Layer" ]
   - type: Appearance
   - type: GenericVisualizer
     visuals:
       enum.ToggleableVisuals.Enabled:
         enum.ToggleableVisuals.Layer:
-          True: {state: landmine}
-          False: {state: landmine-inactive}
+          True: {visible: true}
+          False: {visible: false}
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -74,9 +76,6 @@
     activated: true
     onActivate: false
   - type: Armable
-  - type: Sprite
-    layers:
-    - state: landmine
 
 - type: entity
   name: modular mine
@@ -98,9 +97,6 @@
     activated: true
     onActivate: false
   - type: Armable
-  - type: Sprite
-    layers:
-    - state: landmine
 
 - type: entity
   name: explosive mine
@@ -124,6 +120,3 @@
     activated: true
     onActivate: false
   - type: Armable
-  - type: Sprite
-    layers:
-    - state: landmine

diff --git a/Resources/Textures/Objects/Misc/landmine.rsi/landmine-inactive.png b/Resources/Textures/Objects/Misc/landmine.rsi/landmine-inactive.png
deleted file mode 100644 (file)
index dcc68ec..0000000
Binary files a/Resources/Textures/Objects/Misc/landmine.rsi/landmine-inactive.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/landmine.rsi/landmine-unshaded.png b/Resources/Textures/Objects/Misc/landmine.rsi/landmine-unshaded.png
new file mode 100644 (file)
index 0000000..25aa1bb
Binary files /dev/null and b/Resources/Textures/Objects/Misc/landmine.rsi/landmine-unshaded.png differ

diff --git a/Resources/Textures/Objects/Misc/landmine.rsi/landmine.png b/Resources/Textures/Objects/Misc/landmine.rsi/landmine.png
index 1a95e1c37381f93e669632760d0511bb87ead813..1889629c510517c5998b5ecc635e7ab44c773a94 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/landmine.rsi/landmine.png and b/Resources/Textures/Objects/Misc/landmine.rsi/landmine.png differ

diff --git a/Resources/Textures/Objects/Misc/landmine.rsi/meta.json b/Resources/Textures/Objects/Misc/landmine.rsi/meta.json
index 3e9740d445e46785d8a668e5eb65b07fef705be6..12e4a1d6968f1e160de2876f30f100f9c27a5e2f 100644 (file)
--- a/Resources/Textures/Objects/Misc/landmine.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/landmine.rsi/meta.json
@@ -5,20 +5,20 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b764f0e8c3004ad5e7726e7ff27a52a0c893beff/icons/obj/weapons/grenade.dmi",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b764f0e8c3004ad5e7726e7ff27a52a0c893beff/icons/obj/weapons/grenade.dmi, modified by spanky-spanky (GitHub)",
   "states": [
     {
-      "name": "landmine",
+      "name": "landmine"
+    },
+    {
+      "name": "landmine-unshaded",
       "delays": [
         [
-          0.4,
+          0.75,
           0.15,
           0.1
         ]
       ]
-    },
-    {
-      "name": "landmine-inactive"
     }
   ]
 }