diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index 4f2a8f01e8a..dfb51336289 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -85,18 +85,16 @@ Plasma: 100 - type: Stack stackType: Plasma -# Corvax-Resprite-Start -# baseLayer: base -# layerStates: -# - plasma -# - plasma_2 -# - plasma_3 + baseLayer: base + layerStates: + - plasma + - plasma_2 + - plasma_3 - type: Sprite - state: plasma -# layers: -# - state: plasma_3 -# map: ["base"] -# Corvax-Resprite-End + state: plasma_3 + layers: + - state: plasma_3 + map: ["base"] - type: Item heldPrefix: plasma - type: Appearance diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json index 522843e4cb5..33eae42527e 100644 --- a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/other.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/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/72ef384db938dfef549413970258cda93d42dafb", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/72ef384db938dfef549413970258cda93d42dafb, plasma_2 & plasma_3 combined from plasma", "size": { "x": 32, "y": 32 @@ -72,6 +72,46 @@ ] ] }, + { + "name": "plasma_2", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "plasma_3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "plasma-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png new file mode 100644 index 00000000000..d4834ef28ae Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png new file mode 100644 index 00000000000..ee05fa2cc99 Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png differ