diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml index d120621559..5a94d34033 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml @@ -11,19 +11,7 @@ noRot: true layers: - state: nuclearbomb_base - - state: nukefestive - map: ["christmas"] - visible: false - type: Appearance - - type: HolidayVisuals - holidays: - festive: - - FestiveSeason - - type: GenericVisualizer - visuals: - enum.HolidayVisuals.Holiday: - christmas: - festive: { visible: true } - type: Physics bodyType: Static - type: Fixtures @@ -109,19 +97,7 @@ sprite: Objects/Devices/nuke.rsi layers: - state: nuclearbomb_base - - state: nukefestive - map: ["christmas"] - visible: false - type: Appearance - - type: HolidayVisuals - holidays: - festive: - - FestiveSeason - - type: GenericVisualizer - visuals: - enum.HolidayVisuals.Holiday: - christmas: - festive: { visible: true } - type: Physics bodyType: Dynamic - type: Fixtures diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index 2828b13ddb..8a3608421b 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -1,54 +1,23 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "nuclearbomb_deployed" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "nukefestive", - "delays": [ - [ - 0.25, - 0.25 - ] - ] - }, - { - "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 - ] - ] - } - ] + "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" + } + ] } diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png index f0b41b5bf1..cc1da90991 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 deleted file mode 100644 index fa39a744cd..0000000000 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png index ac5c5d9654..937d431579 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 new file mode 100644 index 0000000000..a28fb828c2 Binary files /dev/null and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_safetyoff.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png index ee674e57db..d8c47c2d03 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 deleted file mode 100644 index ebeb77e2d2..0000000000 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png and /dev/null differ