From: NULL882 <104377798+NULL882@users.noreply.github.com> Date: Thu, 30 Nov 2023 00:57:29 +0000 (+0300) Subject: Mining things [part 2] (#21953) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bb6091a76c22473732a832ac62db854b611344e0;p=space-station-14.git Mining things [part 2] (#21953) * mining-window (Diagonal) * mining-airlock "glass" --- diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 0ba94f7b2f..5a16335ab8 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -175,6 +175,14 @@ - type: AccessReader access: [["Salvage"]] +- type: entity + parent: AirlockMining + id: AirlockMiningLocked + suffix: Mining(Salvage), Locked + components: + - type: AccessReader + access: [["Salvage"]] + - type: entity parent: AirlockMedical id: AirlockMedicalLocked @@ -476,6 +484,14 @@ - type: AccessReader access: [["Salvage"]] +- type: entity + parent: AirlockMiningGlass + id: AirlockMiningGlassLocked + suffix: Mining(Salvage), Locked + components: + - type: AccessReader + access: [["Salvage"]] + - type: entity parent: AirlockChemistryGlass id: AirlockChemistryGlassLocked diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 3667de9181..9c3ab3c767 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -96,6 +96,14 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi +- type: entity + parent: Airlock + id: AirlockMining + suffix: Mining(Salvage) + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/mining.rsi + # Glass - type: entity @@ -255,7 +263,7 @@ - type: entity parent: AirlockGlass id: AirlockMiningGlass - suffix: Mining + suffix: Mining(Salvage) components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/mining.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml index 55c1e31d5c..4dcc1c5fcc 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml @@ -49,4 +49,42 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 100 \ No newline at end of file + price: 100 + +- type: entity + parent: ShuttleWindow + id: MiningWindowDiagonal + name: diagonal mining window + suffix: diagonal + placement: + mode: SnapgridCenter + snap: + - Window + components: + - type: Sprite + drawdepth: WallTops + sprite: Structures/Windows/mining_diagonal.rsi + state: state0 + - type: IconSmooth + mode: Diagonal + key: windows + base: state + - type: Icon + sprite: Structures/Windows/mining_diagonal.rsi + state: state0 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PolygonShape + vertices: + - "-0.5,-0.5" + - "0.5,0.5" + - "0.5,-0.5" + mask: + - FullTileMask + layer: + - GlassLayer + - type: DamageVisuals + damageOverlay: + sprite: Structures/Windows/cracks_diagonal.rsi diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/assembly.png index 322112c36f..33a9e276c7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed.png index 406b40544d..b82e16de2a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closing.png index b68a2ba131..e4019d4d07 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/opening.png index 1eeca9f2ec..460e3187af 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/assembly.png new file mode 100644 index 0000000000..322112c36f Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png new file mode 100644 index 0000000000..9bce6022dc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed.png new file mode 100644 index 0000000000..406b40544d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png new file mode 100644 index 0000000000..cd5c6b4700 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closing.png new file mode 100644 index 0000000000..b68a2ba131 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closing_unlit.png new file mode 100644 index 0000000000..cec5fc7e85 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png new file mode 100644 index 0000000000..adfb0cf39c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png new file mode 100644 index 0000000000..c018c3f9fd Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json new file mode 100644 index 0000000000..f710aeb1ad --- /dev/null +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json @@ -0,0 +1,201 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken at https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.05, + 0.05, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.05, + 0.05, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.05, + 0.05, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open.png new file mode 100644 index 0000000000..a8fcf70b3d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/opening.png new file mode 100644 index 0000000000..1eeca9f2ec Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/opening_unlit.png new file mode 100644 index 0000000000..b4de9fc9e2 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closing.png new file mode 100644 index 0000000000..42b84b72fe Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_open.png new file mode 100644 index 0000000000..c76bdb146b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_opening.png new file mode 100644 index 0000000000..09c5f5ca81 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png new file mode 100644 index 0000000000..4d9cab3c5c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_broken.png new file mode 100644 index 0000000000..fb5d774588 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_damaged.png new file mode 100644 index 0000000000..f16a028dee Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_open.png new file mode 100644 index 0000000000..630eabb976 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/welded.png new file mode 100644 index 0000000000..cf8f37a756 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json new file mode 100644 index 0000000000..439147564d --- /dev/null +++ b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by NULL882 (github)", + "states": [ + { + "name": "state0" + }, + { + "name": "state1" + } + ] +} diff --git a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png new file mode 100644 index 0000000000..54af8484b2 Binary files /dev/null and b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png new file mode 100644 index 0000000000..f790c761bc Binary files /dev/null and b/Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png differ