diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 52747a3f27c..9e7910d4faa 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -120,7 +120,8 @@ name: maintenance access components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/maint.rsi + sprite: _ECHO/Structures/Doors/Airlocks/Standard/maint.rsi #ECHO-Tweak Было: Structures/Doors/Airlocks/Standard/maint.rsi -> Стало: _ECHO/Structures/Doors/Airlocks/Standard/maint.rsi + snapCardinals: false #ECHO-Tweak add: snapCardinals: false - type: entity parent: AirlockSecurity # if you get syndie door somehow it counts as sec diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml index 8824b946e73..ba62b3c9802 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml @@ -164,7 +164,7 @@ suffix: Maintenance components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/maint.rsi + sprite: _ECHO/Structures/Doors/Airlocks/Standard/maint.rsi #ECHO-Tweak Было: Structures/Doors/Airlocks/Standard/maint.rsi -> Стало: _ECHO/Structures/Doors/Airlocks/Standard/maint.rsi state: "assembly" - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index aa69428f9a3..8d3338de96b 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -71,6 +71,10 @@ - type: AccessReader containerAccessProvider: board - type: Door +#ECHO-Tweak-Start (изменения поскольку анимация дольше длится, чем база и нужно задать параметр) + closeTimeTwo: 0.4 + openTimeTwo: 0.4 +#ECHO-Tweak-End crushDamage: types: Blunt: 15 diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png new file mode 100644 index 00000000000..06efa74521c Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png new file mode 100644 index 00000000000..4f823259e4f Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png new file mode 100644 index 00000000000..c306585a65d Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png new file mode 100644 index 00000000000..9219f1cbcb9 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png new file mode 100644 index 00000000000..b737af0131a Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png new file mode 100644 index 00000000000..bd80877b913 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png new file mode 100644 index 00000000000..2e53607bfc5 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png new file mode 100644 index 00000000000..2eea5211f35 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json new file mode 100644 index 00000000000..9e327416590 --- /dev/null +++ b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json @@ -0,0 +1,707 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites made by LuckyRat(discord) for EchoProtocol", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly", + "directions": 4 + }, + { + "name": "bolted_unlit", + "directions": 4 + }, + { + "name": "closed", + "directions": 4 + }, + { + "name": "closed_unlit", + "directions": 4 + }, + { + "name": "closing", + "directions": 4, + "delays": [ + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ] + ] + }, + { + "name": "closing_unlit", + "directions": 4, + "delays": [ + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ] + ] + }, + { + "name": "deny_unlit", + "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, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "directions": 4 + }, + { + "name": "opening", + "directions": 4, + "delays": [ + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ] + ] + }, + { + "name": "opening_unlit", + "directions": 4, + "delays": [ + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ] + ] + }, + { + "name": "panel_closing", + "directions": 4, + "delays": [ + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ] + ] + }, + { + "name": "panel_open", + "directions": 4 + }, + { + "name": "panel_opening", + "directions": 4, + "delays": [ + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ], + [ + 0.1, + 0.05, + 0.06, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.02, + 0.06, + 0.06, + 0.1 + ] + ] + }, + { + "name": "sparks", + "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, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "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, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "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, + 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": "sparks_open", + "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, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded", + "directions": 4 + }, + { + "name": "emergency_unlit", + "directions": 4, + "delays": [ + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ], + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/open.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/open.png new file mode 100644 index 00000000000..d8c456aba29 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/open.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png new file mode 100644 index 00000000000..5619700dd60 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png new file mode 100644 index 00000000000..515db6900f3 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png new file mode 100644 index 00000000000..1e936d98619 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png new file mode 100644 index 00000000000..040b9b0fb24 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png new file mode 100644 index 00000000000..ed98b43c9dc Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png new file mode 100644 index 00000000000..3c27742ebec Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png new file mode 100644 index 00000000000..cef67226844 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png new file mode 100644 index 00000000000..8d6d9313a47 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png new file mode 100644 index 00000000000..f4b28441733 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png differ diff --git a/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png new file mode 100644 index 00000000000..8a9f8182ea2 Binary files /dev/null and b/Resources/Textures/_ECHO/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png differ