diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index f29d2456d7..8194a9e609 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -227,7 +227,7 @@ suffix: Salvage components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/cargo.rsi + sprite: _Sunrise/Structures/Doors/Airlocks/Glass/salvage.rsi #Sunrise-Resprite - type: Wires layoutId: AirlockCargo diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/access.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/access.yml index c085b8bee5..f4eb632467 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/access.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/access.yml @@ -22,7 +22,7 @@ - type: entity id: DoubleGlassAirlockSalvageLocked - parent: [ DoubleGlassAirlockMiner ] + parent: [ DoubleGlassAirlockSalvage ] suffix: Salvage, Locked components: - type: ContainerFill @@ -133,7 +133,7 @@ - type: entity id: TripleGlassAirlockSalvageLocked - parent: [ TripleGlassAirlockCargo ] + parent: [ TripleGlassAirlockSalvage ] suffix: Salvage, Locked components: - type: ContainerFill diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml index 28e6a8cfaa..d343348b84 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml @@ -188,7 +188,7 @@ sprite: _Sunrise/Structures/Doors/Airlocks/Glass/double_virology.rsi - type: entity - id: DoubleGlassAirlockMiner + id: DoubleGlassAirlockSalvage parent: [ DoubleGlassAirlock, AirlockMiningGlass ] suffix: Mining(Salvage) components: @@ -269,6 +269,14 @@ - type: Sprite sprite: _Sunrise/Structures/Doors/Airlocks/Glass/triple_medical.rsi +- type: entity + id: TripleGlassAirlockSalvage + parent: [ TripleGlassAirlock, AirlockMiningGlass ] + suffix: Mining(Salvage) + components: + - type: Sprite + sprite: _Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi + - type: entity id: TripleGlassAirlockScience parent: [ TripleGlassAirlock, AirlockScienceGlass ] diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/assembly.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/assembly.png new file mode 100644 index 0000000000..b2ba20450e Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/assembly.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/bolted_open_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..14143143e9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/bolted_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/bolted_unlit.png new file mode 100644 index 0000000000..8e5d4b00e4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closed.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closed.png new file mode 100644 index 0000000000..5fc1982346 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closed.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closed_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closed_unlit.png new file mode 100644 index 0000000000..f9c305d5f8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closing.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closing.png new file mode 100644 index 0000000000..f3178ac6e7 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closing.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closing_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closing_unlit.png new file mode 100644 index 0000000000..1bd9eeead5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/deny_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/deny_unlit.png new file mode 100644 index 0000000000..d9f4dbb13b Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/emergency_open_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..14143143e9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/emergency_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/emergency_unlit.png new file mode 100644 index 0000000000..09984cab03 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/meta.json new file mode 100644 index 0000000000..9671c30f18 --- /dev/null +++ b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/meta.json @@ -0,0 +1,443 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Noychik for Sunrise Station", + "size": { + "x": 96, + "y": 96 + }, + "states": [ + { + "name": "assembly", + "directions": 4 + }, + { + "name": "bolted_unlit", + "directions": 4 + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "closed", + "directions": 4 + }, + { + "name": "closed_unlit", + "directions": 4 + }, + { + "name": "open_unlit" + }, + { + "name": "closing", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "directions": 4, + "delays": [ + [ + 1.2, + 1.2 + ], + [ + 1.2, + 1.2 + ], + [ + 1.2, + 1.2 + ], + [ + 1.2, + 1.2 + ] + ] + }, + { + "name": "open", + "directions": 4 + }, + { + "name": "opening", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closed" + }, + { + "name": "panel_opening", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ], + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + + { + "name": "panel_open", + "directions": 4 + }, + { + "name": "sparks", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_broken", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_damaged", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "directions": 4 + }, + { + "name": "welded", + "directions": 4 + }, + { + "name": "emergency_unlit", + "directions": 4, + "delays": [ + [ + 1.2, + 1.2 + ], + [ + 1.2, + 1.2 + ], + [ + 1.2, + 1.2 + ], + [ + 1.2, + 1.2 + ] + ] + }, + { + "name": "emergency_open_unlit", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/open.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/open.png new file mode 100644 index 0000000000..5087a3b881 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/open.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/open_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/open_unlit.png new file mode 100644 index 0000000000..14143143e9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/open_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/opening.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/opening.png new file mode 100644 index 0000000000..7ad9a98bc0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/opening.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/opening_unlit.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/opening_unlit.png new file mode 100644 index 0000000000..90fa5834f1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_closed.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_closed.png new file mode 100644 index 0000000000..bcacd76ce1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_closed.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_closing.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_closing.png new file mode 100644 index 0000000000..700a5a621b Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_closing.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_open.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_open.png new file mode 100644 index 0000000000..857b16e481 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_open.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_opening.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_opening.png new file mode 100644 index 0000000000..e5f7765b9a Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/panel_opening.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks.png new file mode 100644 index 0000000000..5f310f120f Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_broken.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_broken.png new file mode 100644 index 0000000000..7d204c6538 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_damaged.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_damaged.png new file mode 100644 index 0000000000..7d204c6538 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_open.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_open.png new file mode 100644 index 0000000000..14143143e9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/sparks_open.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/welded.png b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/welded.png new file mode 100644 index 0000000000..eb8f7aff73 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Doors/Airlocks/Glass/triple_salvage.rsi/welded.png differ