From: Spanky <180730777+spanky-spanky@users.noreply.github.com> Date: Fri, 6 Jun 2025 23:01:14 +0000 (-0400) Subject: Light Up Landmines (#38092) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=668a0f086333ce00e796692e2f9fbc4cca9e5549;p=space-station-14.git 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 1252453019..7ed1b657ea 100644 --- 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 index dcc68ec28b..0000000000 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 index 0000000000..25aa1bb1d8 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 1a95e1c373..1889629c51 100644 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 3e9740d445..12e4a1d696 100644 --- 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" } ] }