diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index 169795659b..6e44a5417f 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -1,23 +1,45 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "nuclearbomb_deployed" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d", - "states": [ - { - "name": "nuclearbomb_base" - }, - { - "name": "nuclearbomb_exploding" - }, - { - "name": "nuclearbomb_safetyoff" - }, - { - "name": "nuclearbomb_timing" - } - ] -} \ No newline at end of file + { + "name": "nuclearbomb_timing", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "nuclearbomb_exploding", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "nuclearbomb_base" + }, + { + "name": "nuclearbombc", + "delays": [ + [ + 1, + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png index cc1da90991..f0b41b5bf1 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png new file mode 100644 index 0000000000..fa39a744cd Binary files /dev/null and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png index 937d431579..ac5c5d9654 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_safetyoff.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_safetyoff.png deleted file mode 100644 index a28fb828c2..0000000000 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_safetyoff.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png index d8c47c2d03..ee674e57db 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png new file mode 100644 index 0000000000..ebeb77e2d2 Binary files /dev/null and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png differ