diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index cf76c695cb40..f0d0075c1e2a 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -198,7 +198,7 @@ mode: SnapgridCenter components: - type: Sprite - sprite: Structures/Piping/Atmospherics/thermomachine.rsi + sprite: SS220/Structures/Piping/Atmospherics/thermomachine.rsi #ss220-engineering-update-thermomachine snapCardinals: true - type: Appearance - type: PipeColorVisuals @@ -248,18 +248,25 @@ granularLayersRendering: true layers: - state: freezerOff - map: [ "enum.PowerDeviceVisualLayers.Powered" ] +# map: [ "enum.PowerDeviceVisualLayers.Powered" ] #ss220-engineering-update-thermomachine - state: freezerPanelOpen map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - state: pipe map: [ "enum.PipeVisualLayers.Pipe" ] renderingStrategy: Default + #ss220-engineering-update-thermomachine-begin + - state: freezerOn-unshaded + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + #ss220-engineering-update-thermomachine-end - type: GenericVisualizer visuals: enum.PowerDeviceVisuals.Powered: enum.PowerDeviceVisualLayers.Powered: - True: { state: freezerOn } - False: { state: freezerOff } + #ss220-engineering-update-thermomachine-begin + True: { visible: true } + False: { visible: false } + #ss220-engineering-update-thermomachine-end - type: GasThermoMachine coefficientOfPerformance: -3.9 - type: ApcPowerReceiver @@ -293,18 +300,25 @@ granularLayersRendering : true layers: - state: heaterOff - map: [ "enum.PowerDeviceVisualLayers.Powered" ] +# map: [ "enum.PowerDeviceVisualLayers.Powered" ] #ss220-engineering-update-thermomachine - state: heaterPanelOpen map: ["enum.WiresVisualLayers.MaintenancePanel"] - state: pipe map: [ "enum.PipeVisualLayers.Pipe" ] renderingStrategy: Default + #ss220-engineering-update-thermomachine-begin + - state: heaterOn-unshaded + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + #ss220-engineering-update-thermomachine-end - type: GenericVisualizer visuals: enum.PowerDeviceVisuals.Powered: enum.PowerDeviceVisualLayers.Powered: - True: { state: heaterOn } - False: { state: heaterOff } + #ss220-engineering-update-thermomachine-begin + True: { visible: true } + False: { visible: false } + #ss220-engineering-update-thermomachine-end - type: GasThermoMachine coefficientOfPerformance: 0.95 - type: ApcPowerReceiver @@ -332,7 +346,7 @@ description: An advanced machine that cools gas in connected pipes. Has the side effect of chilling the surrounding area. Cold as Hell! components: - type: Sprite - sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi + sprite: SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi #ss220-engineering-update-thermomachine - type: GasThermoMachine minTemperature: 23.15 heatCapacity: 40000 @@ -347,7 +361,7 @@ description: An advanced machine that heats gas in connected pipes. Has the side effect of leaking heat into the surrounding area. Hot as Hell! components: - type: Sprite - sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi + sprite: SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi #ss220-engineering-update-thermomachine - type: GasThermoMachine maxTemperature: 1193.15 heatCapacity: 40000 diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 7b907fb46095..9b21312d50b4 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -306,7 +306,7 @@ id: FreezerHeater name: steal-target-groups-freezer-heater sprite: - sprite: Structures/Piping/Atmospherics/thermomachine.rsi + sprite: SS220/Structures/Piping/Atmospherics/thermomachine.rsi #ss220-engineering-update-thermomachine state: heaterOff - type: stealTargetGroup diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 8a96d3ffdd09..6580f95d4068 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -94,7 +94,7 @@ id: AtmosphericTech name: research-technology-atmospheric-tech icon: - sprite: Structures/Piping/Atmospherics/thermomachine.rsi + sprite: SS220/Structures/Piping/Atmospherics/thermomachine.rsi #ss220-engineering-update-thermomachine state: freezerOff discipline: Industrial tier: 1 diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerOff.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerOff.png new file mode 100644 index 000000000000..dc96df5261cb Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerOff.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerOn-unshaded.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerOn-unshaded.png new file mode 100644 index 000000000000..da273aeb2e7a Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerOn-unshaded.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerPanelOpen.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerPanelOpen.png new file mode 100644 index 000000000000..339771ee3a34 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/freezerPanelOpen.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterOff.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterOff.png new file mode 100644 index 000000000000..95b2508d2ed4 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterOff.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterOn-unshaded.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterOn-unshaded.png new file mode 100644 index 000000000000..83b98a4f250f Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterOn-unshaded.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterPanelOpen.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterPanelOpen.png new file mode 100644 index 000000000000..606704a5c544 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/heaterPanelOpen.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/meta.json b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/meta.json new file mode 100644 index 000000000000..d006fd788329 --- /dev/null +++ b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version":1, + "size":{"x":32,"y":32}, + "copyright":"Sprite by by AftrLite(Github)", + "license":"CC-BY-SA-3.0", + "states":[ + { + "name":"freezerOff", + "directions":1 + }, + { + "name":"freezerPanelOpen", + "directions":1 + }, + { + "name":"freezerOn-unshaded", + "directions":1, + "delays":[ [ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0 ] ] + }, + { + "name":"heaterOff", + "directions":1 + }, + { + "name":"heaterPanelOpen", + "directions":1 + }, + { + "name":"heaterOn-unshaded", + "directions":1, + "delays":[ [ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0 ] ] + }, + { + "name":"pipe", + "directions":4 + } + ] +} diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/pipe.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/pipe.png new file mode 100644 index 000000000000..6f62da6a73e7 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/hellfirethermomachine.rsi/pipe.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png new file mode 100644 index 000000000000..b4217e7f33bd Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn-unshaded.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn-unshaded.png new file mode 100644 index 000000000000..4fb8cc3510ba Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn-unshaded.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png new file mode 100644 index 000000000000..6240ac30d5e2 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png new file mode 100644 index 000000000000..2a709bb2cdfc Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn-unshaded.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn-unshaded.png new file mode 100644 index 000000000000..aa10d632445f Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn-unshaded.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png new file mode 100644 index 000000000000..05ca384268c7 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png differ diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json new file mode 100644 index 000000000000..d006fd788329 --- /dev/null +++ b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version":1, + "size":{"x":32,"y":32}, + "copyright":"Sprite by by AftrLite(Github)", + "license":"CC-BY-SA-3.0", + "states":[ + { + "name":"freezerOff", + "directions":1 + }, + { + "name":"freezerPanelOpen", + "directions":1 + }, + { + "name":"freezerOn-unshaded", + "directions":1, + "delays":[ [ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0 ] ] + }, + { + "name":"heaterOff", + "directions":1 + }, + { + "name":"heaterPanelOpen", + "directions":1 + }, + { + "name":"heaterOn-unshaded", + "directions":1, + "delays":[ [ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0 ] ] + }, + { + "name":"pipe", + "directions":4 + } + ] +} diff --git a/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png new file mode 100644 index 000000000000..6f62da6a73e7 Binary files /dev/null and b/Resources/Textures/SS220/Structures/Piping/Atmospherics/thermomachine.rsi/pipe.png differ