diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index 78fdaae01a..023d2f129a 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -9,7 +9,7 @@ - type: InteractionOutline - type: Sprite snapCardinals: true - sprite: Structures/Power/Generation/ame.rsi + sprite: White/Structures/Power/Generation/ame.rsi state: control layers: - state: control @@ -82,7 +82,7 @@ - type: PowerMonitoringDevice group: Generator loadNode: input - sprite: Structures/Power/Generation/ame.rsi + sprite: White/Structures/Power/Generation/ame.rsi state: static - type: PowerSupplier supplyRate: 0 @@ -121,7 +121,7 @@ - type: InteractionOutline - type: Sprite drawdepth: Walls - sprite: Structures/Power/Generation/ame.rsi + sprite: White/Structures/Power/Generation/ame.rsi state: shield_0 layers: - state: shield_0 diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index 5a28c4962c..069ea4d827 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml @@ -27,7 +27,7 @@ layer: - MidImpassable, LowImpassable, BulletImpassable - type: Sprite - sprite: Structures/Power/Generation/solar_panel.rsi + sprite: White/Structures/Power/Generation/solar_panel.rsi state: normal - type: NodeContainer examinable: true @@ -38,7 +38,7 @@ - type: PowerMonitoringDevice group: Generator loadNode: output - sprite: Structures/Power/Generation/solar_panel.rsi + sprite: White/Structures/Power/Generation/solar_panel.rsi state: static collectionName: SolarPanel - type: Anchorable @@ -135,7 +135,7 @@ layer: - MachineLayer - type: Sprite - sprite: Structures/Power/Generation/solar_panel.rsi + sprite: White/Structures/Power/Generation/solar_panel.rsi state: solar_assembly - type: Transform anchored: true @@ -180,7 +180,7 @@ layer: - MachineLayer - type: Sprite - sprite: Structures/Power/Generation/solar_panel.rsi + sprite: White/Structures/Power/Generation/solar_panel.rsi state: solar_tracker - type: Transform anchored: true diff --git a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-left.png b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-left.png index 49b4913605..506bf19a06 100644 Binary files a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-left.png and b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-right.png b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-right.png index be9f3f1182..65c30b728a 100644 Binary files a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-right.png and b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/jar.png b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/jar.png index ede7ec4094..5fdc2412fa 100644 Binary files a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/jar.png and b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/jar.png differ diff --git a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json index b036496687..66f33fbc69 100644 --- a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json +++ b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041", + "copyright": "FrostyDev", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control.png new file mode 100644 index 0000000000..2c1b6ff57c Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_critical.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_critical.png new file mode 100644 index 0000000000..f7c9b3e3c2 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_critical.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_fuck.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_fuck.png new file mode 100644 index 0000000000..388c6478d6 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_fuck.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_on.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_on.png new file mode 100644 index 0000000000..0a991ff963 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_on.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_warning.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_warning.png new file mode 100644 index 0000000000..7f64302cdc Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/control_warning.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core.png new file mode 100644 index 0000000000..6110c84a84 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_strong.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_strong.png new file mode 100644 index 0000000000..19707a8ad5 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_strong.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_weak.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_weak.png new file mode 100644 index 0000000000..748de3ea91 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/core_weak.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/meta.json b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/meta.json new file mode 100644 index 0000000000..391b7447f3 --- /dev/null +++ b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/meta.json @@ -0,0 +1,217 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "FrostyDev", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shield_0" + }, + { + "name": "shield_1" + }, + { + "name": "shield_10" + }, + { + "name": "shield_11" + }, + { + "name": "shield_12" + }, + { + "name": "shield_13" + }, + { + "name": "shield_14" + }, + { + "name": "shield_15" + }, + { + "name": "shield_2" + }, + { + "name": "shield_3" + }, + { + "name": "shield_4" + }, + { + "name": "shield_5" + }, + { + "name": "shield_6" + }, + { + "name": "shield_7" + }, + { + "name": "shield_8" + }, + { + "name": "core" + }, + { + "name": "shield_9" + }, + { + "name": "core_weak", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "core_strong", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "control" + }, + { + "name": "static" + }, + { + "name": "control_warning", + "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, + 0.1, + 0.1 + ] + ] + }, + { + "name": "control_critical", + "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, + 0.1, + 0.1 + ] + ] + }, + { + "name": "control_fuck", + "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, + 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, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "control_on", + "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, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_0.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_0.png new file mode 100644 index 0000000000..a8fe6d1de2 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_0.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_1.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_1.png new file mode 100644 index 0000000000..3807a41c11 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_1.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_10.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_10.png new file mode 100644 index 0000000000..ee900bb3a6 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_10.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_11.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_11.png new file mode 100644 index 0000000000..d3ef87f444 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_11.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_12.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_12.png new file mode 100644 index 0000000000..ce52c96d9b Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_12.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_13.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_13.png new file mode 100644 index 0000000000..f37b7c2e62 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_13.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_14.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_14.png new file mode 100644 index 0000000000..1016aabb5f Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_14.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_15.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_15.png new file mode 100644 index 0000000000..a8fe6d1de2 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_15.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_2.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_2.png new file mode 100644 index 0000000000..53bcf694c3 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_2.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_3.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_3.png new file mode 100644 index 0000000000..4ac1325e8a Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_3.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_4.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_4.png new file mode 100644 index 0000000000..1c07f92236 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_4.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_5.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_5.png new file mode 100644 index 0000000000..45014483b6 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_5.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_6.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_6.png new file mode 100644 index 0000000000..b56519ec71 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_6.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_7.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_7.png new file mode 100644 index 0000000000..1c2b41eced Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_7.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_8.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_8.png new file mode 100644 index 0000000000..00bef3f896 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_8.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_9.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_9.png new file mode 100644 index 0000000000..3009e25964 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/shield_9.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/ame.rsi/static.png b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/static.png new file mode 100644 index 0000000000..2c1b6ff57c Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/ame.rsi/static.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/broken.png b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/broken.png new file mode 100644 index 0000000000..a12fca0425 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/broken.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/meta.json b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/meta.json new file mode 100644 index 0000000000..c76db66048 --- /dev/null +++ b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version":1, + "license":"CC-BY-SA-3.0", + "copyright":"FrostyDev", + "size":{"x":32,"y":32}, + "states": + [ + { + "name": "normal", + "select": [], + "flags": {}, + "directions": 8 + }, + { + "name": "broken", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "static" + }, + { + "name": "solar_assembly" + }, + { + "name": "solar_tracker" + } + ] +} diff --git a/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/normal.png b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/normal.png new file mode 100644 index 0000000000..21026d8d78 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/normal.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png new file mode 100644 index 0000000000..adb7bb3ff6 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_assembly.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png new file mode 100644 index 0000000000..c977194da2 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/solar_tracker.png differ diff --git a/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/static.png b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/static.png new file mode 100644 index 0000000000..1bdecf5e91 Binary files /dev/null and b/Resources/Textures/White/Structures/Power/Generation/solar_panel.rsi/static.png differ