From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 16 Jun 2024 10:43:22 +0000 (-0400) Subject: Apc & Substation resprite (#28998) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=9348a5cea609f6ccb5045341bd83422a20cc0e8c;p=space-station-14.git Apc & Substation resprite (#28998) * substation * apcs * top pixels * new screens --- diff --git a/Content.Client/Power/APC/ApcVisualizerComponent.cs b/Content.Client/Power/APC/ApcVisualizerComponent.cs index 87cb70019f..e356a80177 100644 --- a/Content.Client/Power/APC/ApcVisualizerComponent.cs +++ b/Content.Client/Power/APC/ApcVisualizerComponent.cs @@ -87,7 +87,7 @@ public sealed partial class ApcVisualsComponent : Component /// [DataField("screenColors")] [ViewVariables(VVAccess.ReadWrite)] - public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#2e8ad1"), Color.FromHex("#3db83b"), Color.FromHex("#ffac1c")}; + public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#dcdc28"), Color.FromHex("#82ff4c"), Color.FromHex("#ffac1c")}; /// /// The sprite state of the unlit overlay used for the APC screen when the APC has been emagged. diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index 71e4506495..1621ac858c 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -35,21 +35,26 @@ - state: display-charging shader: unshaded map: ["enum.ApcVisualLayers.ChargeState"] - - state: lock0-unlocked + - state: lock0-locked shader: unshaded map: ["enum.ApcVisualLayers.InterfaceLock"] - - state: lock1-unlocked + visible: false + - state: lock1-locked shader: unshaded map: ["enum.ApcVisualLayers.PanelLock"] - - state: channel0-auto_on + visible: false + - state: lock1-locked #when these are implemented get actual sprites. shader: unshaded map: ["enum.ApcVisualLayers.Equipment"] - - state: channel1-auto_on + visible: false + - state: lock1-locked shader: unshaded map: ["enum.ApcVisualLayers.Lighting"] - - state: channel2-auto_on + visible: false + - state: lock1-locked shader: unshaded map: ["enum.ApcVisualLayers.Environment"] + visible: false - type: Appearance - type: ApcVisuals - type: Battery diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 347b18ecae..692f027386 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -23,8 +23,8 @@ - type: ExaminableBattery - type: PointLight radius: 1.5 - energy: 1.6 - color: "#3db83b" + energy: 1 + color: "#ff6900" castShadows: false - type: NodeContainer examinable: true @@ -126,10 +126,11 @@ path: /Audio/Ambience/Objects/buzzing.ogg - type: PointLight radius: 1.5 - energy: 1.6 - color: "#3db83b" + energy: 1 + color: "#ff6900" netsync: false castShadows: false + offset: 0, -0.2 - type: Clickable - type: AccessReader access: [["Engineering"]] @@ -151,7 +152,7 @@ sprite: Structures/Power/substation.rsi layers: - state: substation_wall - - state: screen + - state: screen_wall shader: unshaded - type: Battery maxCharge: 2000000 diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png index 2b42c54935..68b83101d2 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/base.png and b/Resources/Textures/Structures/Power/apc.rsi/base.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/broken.png b/Resources/Textures/Structures/Power/apc.rsi/broken.png index 092694c371..bb54b4bdc7 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/broken.png and b/Resources/Textures/Structures/Power/apc.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png deleted file mode 100644 index ba84b7d6db..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png deleted file mode 100644 index 6cce72f795..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png deleted file mode 100644 index 61ae057d50..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png deleted file mode 100644 index 6cc48bd1a5..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png deleted file mode 100644 index b31bed6c6b..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png deleted file mode 100644 index 959a05cde0..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png deleted file mode 100644 index 3bb505ecb8..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png deleted file mode 100644 index bd8b013310..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png deleted file mode 100644 index 0cca860220..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png deleted file mode 100644 index 56802dc043..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png deleted file mode 100644 index 5ac134cb54..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png deleted file mode 100644 index 5ebec4feee..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png index 67e3b3df19..0f26ba31bd 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png and b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-full.png b/Resources/Textures/Structures/Power/apc.rsi/display-full.png index 1739853e2b..9b1e28db26 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-full.png and b/Resources/Textures/Structures/Power/apc.rsi/display-full.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png index c4c103eeb9..e360f9c6bb 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png and b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png index be343a987b..089eb9345e 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png and b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png index 2713c5506a..140ae850be 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png and b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/frame.png b/Resources/Textures/Structures/Power/apc.rsi/frame.png index 7d3529f63f..4f8ba4d56e 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/frame.png and b/Resources/Textures/Structures/Power/apc.rsi/frame.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png index 45562de8a6..20f2e17d94 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png deleted file mode 100644 index f6377a36b1..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png index f92c04aac4..3dfeb215d2 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png and b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png deleted file mode 100644 index 44f9af733f..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json index 82f78ccb87..66df303df9 100644 --- a/Resources/Textures/Structures/Power/apc.rsi/meta.json +++ b/Resources/Textures/Structures/Power/apc.rsi/meta.json @@ -1,88 +1,106 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and heavily modified by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "base" + "name": "base", + "directions": 4 }, { "name": "static" }, { - "name": "broken" + "name": "broken", + "directions": 4 }, { - "name": "frame" + "name": "frame", + "directions": 4 }, { - "name": "panel" + "name": "panel", + "directions": 4 }, { - "name": "lock0-unlocked" + "name": "lock0-locked", + "directions": 4 }, { - "name": "lock0-locked" - }, - { - "name": "lock1-unlocked" - }, - { - "name": "lock1-locked" - }, - { - "name": "channel0-auto_off" - }, - { - "name": "channel0-manual_off" - }, - { - "name": "channel0-auto_on" - }, - { - "name": "channel0-manual_on" - }, - { - "name": "channel1-auto_off" - }, - { - "name": "channel1-manual_off" - }, - { - "name": "channel1-auto_on" - }, - { - "name": "channel1-manual_on" - }, - { - "name": "channel2-auto_off" - }, - { - "name": "channel2-manual_off" - }, - { - "name": "channel2-auto_on" - }, - { - "name": "channel2-manual_on" + "name": "lock1-locked", + "directions": 4 }, { "name": "display-lack", + "directions": 4, "delays": [ [ + 0.25, + 0.25, + 1, + 3 + ], + [ + 0.25, + 0.25, + 1, + 3 + ], + [ + 0.25, + 0.25, 1, - 2 + 3 + ], + [ + 0.25, + 0.25, + 1, + 3 ] ] }, { "name": "display-charging", + "directions": 4, "delays": [ [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2 + ], + [ + 0.1, + 0.1, 0.1, 0.1, 0.1, @@ -94,7 +112,20 @@ }, { "name": "display-full", + "directions": 4, "delays": [ + [ + 1, + 1 + ], + [ + 1, + 1 + ], + [ + 1, + 1 + ], [ 1, 1 @@ -103,7 +134,29 @@ }, { "name": "display-remote", + "directions": 4, "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, + 0.1, + 0.1 + ], [ 0.1, 0.1, @@ -115,7 +168,20 @@ }, { "name": "emag-unlit", + "directions": 4, "delays": [ + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], [ 0.5, 0.5 diff --git a/Resources/Textures/Structures/Power/apc.rsi/panel.png b/Resources/Textures/Structures/Power/apc.rsi/panel.png index 97f8471f29..9e64b70a50 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/panel.png and b/Resources/Textures/Structures/Power/apc.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/static.png b/Resources/Textures/Structures/Power/apc.rsi/static.png index 43089d0d81..7275cfc9fe 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/static.png and b/Resources/Textures/Structures/Power/apc.rsi/static.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png index 538dc2b7a8..7675535164 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/charging.png and b/Resources/Textures/Structures/Power/substation.rsi/charging.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png index 9fbff744ca..27440c1c77 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/dead.png and b/Resources/Textures/Structures/Power/substation.rsi/dead.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png index d179742669..d0b9726cac 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/full.png and b/Resources/Textures/Structures/Power/substation.rsi/full.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json index 0125458641..d19066274d 100644 --- a/Resources/Textures/Structures/Power/substation.rsi/meta.json +++ b/Resources/Textures/Structures/Power/substation.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser.", + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 @@ -13,8 +13,39 @@ { "name": "substation_static" }, - { - "name": "substation_wall" + { + "name": "substation_wall", + "directions": 4 + }, + { + "name": "screen_wall", + "directions": 4, + "delays": [ + [ + 5.0, + 0.5, + 0.5, + 0.5 + ], + [ + 5.0, + 0.5, + 0.5, + 0.5 + ], + [ + 5.0, + 0.5, + 0.5, + 0.5 + ], + [ + 5.0, + 0.5, + 0.5, + 0.5 + ] + ] }, { "name": "substation_wall_static" @@ -23,21 +54,31 @@ "name": "full" }, { - "name": "charging" + "name": "charging", + "delays": [ + [ + 0.1, + 0.1 + ] + ] }, { - "name": "dead" + "name": "dead", + "delays": [ + [ + 0.3, + 0.1 + ] + ] }, { "name": "screen", "delays": [ [ - 0.15, - 0.15, - 0.15, - 0.15, - 0.15, - 0.15 + 5.0, + 0.5, + 0.5, + 0.5 ] ] } diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png index 60c922c53f..24420ec31c 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/screen.png and b/Resources/Textures/Structures/Power/substation.rsi/screen.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png new file mode 100644 index 0000000000..c1dfb87b1c Binary files /dev/null and b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png index b9d1eb18d8..68ef981ae5 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation.png and b/Resources/Textures/Structures/Power/substation.rsi/substation.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png index 9d5b8598f4..eee995843f 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png index 155ced7128..ab250c6747 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png differ diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png index e810e6a5a4..f4cc933b4a 100644 Binary files a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png and b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png differ