From 374f0318c7f1b4ec93040ff57961eb1e89e31e1d Mon Sep 17 00:00:00 2001 From: Radezolid Date: Tue, 15 Oct 2024 20:01:23 -0300 Subject: [PATCH 01/18] Raised the price of tracking implants. (#2011) * Raised the price. * Added comment. Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: Radezolid --------- Signed-off-by: Radezolid Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Catalog/Cargo/cargo_armory.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 6341042bf89..1682f56199d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -24,7 +24,7 @@ sprite: Objects/Specific/Medical/implanter.rsi state: implanter0 product: CrateTrackingImplants - cost: 1000 + cost: 4000 # DeltaV - was 1000 category: cargoproduct-category-name-armory group: market From 8a1d68b3df87fd87941e1d4b43ef20af1b38b914 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Wed, 16 Oct 2024 01:01:42 +0200 Subject: [PATCH 02/18] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 474cc6567cf..2f13997b425 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: The 10 reserved whitelist slots have been removed until further notice. - type: Tweak - id: 111 - time: '2023-10-29T03:10:27.0000000+00:00' - author: Colin-Tel changes: - message: Altered the rules. Read the latest changes to them at the top of the @@ -3675,3 +3669,10 @@ id: 610 time: '2024-10-14T23:43:17.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1980 +- author: Radezolid + changes: + - message: The tracking implants crate is now more expensive. + type: Tweak + id: 611 + time: '2024-10-15T23:01:23.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2011 From bae487611cd644e790c6333b69936b33d554b85f Mon Sep 17 00:00:00 2001 From: Radezolid Date: Wed, 16 Oct 2024 08:41:06 -0300 Subject: [PATCH 03/18] Removes suffix from toy box. (#2013) Commented out the suffix. --- .../Prototypes/Entities/Structures/Storage/Crates/crates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 7976476743b..107e8f94d50 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -456,7 +456,7 @@ parent: CratePirate id: CrateToyBox name: toy box - suffix: Empty + #suffix: Empty # Delta V - Commented out simply for clarity at spawn menu on other uses besides the filled toy box. description: A box overflowing with fun. components: - type: Sprite From 933c60588448fd4198d609fcb8e25f3e6f23b552 Mon Sep 17 00:00:00 2001 From: Unkn0wn_Gh0st Date: Thu, 17 Oct 2024 19:31:47 -0500 Subject: [PATCH 04/18] Chemistry/Hydroponics Airlock Resprites (#1995) * Chemistry/Hydroponics Airlock Resprites * Chemistry/Hydroponics Airlock Resprites * Chemistry/Hydroponics Airlock Resprites * Chemistry/Hydroponics Airlock Resprites * Chemistry/Hydroponics Airlock Resprites * Chemistry/Hydroponics Airlock Resprites * Chemistry/Hydroponics Airlock Resprites --- .../Structures/Doors/Airlocks/assembly.yml | 19 ++ .../Structures/Doors/airlock_groups.yml | 10 +- .../Structures/Doors/Airlocks/airlocks.yml | 11 +- .../Structures/Doors/Airlocks/assembly.yml | 4 +- .../Airlocks/Glass/chemistry.rsi/assembly.png | Bin 0 -> 543 bytes .../Glass/chemistry.rsi/bolted_unlit.png | Bin 0 -> 191 bytes .../Airlocks/Glass/chemistry.rsi/closed.png | Bin 0 -> 696 bytes .../Glass/chemistry.rsi/closed_unlit.png | Bin 0 -> 184 bytes .../Airlocks/Glass/chemistry.rsi/closing.png | Bin 0 -> 2007 bytes .../Glass/chemistry.rsi/closing_unlit.png | Bin 0 -> 530 bytes .../Glass/chemistry.rsi/deny_unlit.png | Bin 0 -> 350 bytes .../Glass/chemistry.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Airlocks/Glass/chemistry.rsi/meta.json | 195 ++++++++++++++++++ .../Airlocks/Glass/chemistry.rsi/open.png | Bin 0 -> 377 bytes .../Airlocks/Glass/chemistry.rsi/opening.png | Bin 0 -> 2000 bytes .../Glass/chemistry.rsi/opening_unlit.png | Bin 0 -> 523 bytes .../Glass/chemistry.rsi/panel_closing.png | Bin 0 -> 590 bytes .../Glass/chemistry.rsi/panel_open.png | Bin 0 -> 341 bytes .../Glass/chemistry.rsi/panel_opening.png | Bin 0 -> 603 bytes .../Airlocks/Glass/chemistry.rsi/sparks.png | Bin 0 -> 697 bytes .../Glass/chemistry.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Glass/chemistry.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Glass/chemistry.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Airlocks/Glass/chemistry.rsi/welded.png | Bin 0 -> 719 bytes .../Glass/hydroponics.rsi/assembly.png | Bin 0 -> 554 bytes .../Glass/hydroponics.rsi/bolted_unlit.png | Bin 0 -> 191 bytes .../Airlocks/Glass/hydroponics.rsi/closed.png | Bin 0 -> 713 bytes .../Glass/hydroponics.rsi/closed_unlit.png | Bin 0 -> 184 bytes .../Glass/hydroponics.rsi/closing.png | Bin 0 -> 2059 bytes .../Glass/hydroponics.rsi/closing_unlit.png | Bin 0 -> 530 bytes .../Glass/hydroponics.rsi/deny_unlit.png | Bin 0 -> 350 bytes .../Glass/hydroponics.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Airlocks/Glass/hydroponics.rsi/meta.json | 195 ++++++++++++++++++ .../Airlocks/Glass/hydroponics.rsi/open.png | Bin 0 -> 380 bytes .../Glass/hydroponics.rsi/opening.png | Bin 0 -> 2064 bytes .../Glass/hydroponics.rsi/opening_unlit.png | Bin 0 -> 523 bytes .../Glass/hydroponics.rsi/panel_closing.png | Bin 0 -> 590 bytes .../Glass/hydroponics.rsi/panel_open.png | Bin 0 -> 341 bytes .../Glass/hydroponics.rsi/panel_opening.png | Bin 0 -> 603 bytes .../Airlocks/Glass/hydroponics.rsi/sparks.png | Bin 0 -> 697 bytes .../Glass/hydroponics.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Glass/hydroponics.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Glass/hydroponics.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Airlocks/Glass/hydroponics.rsi/welded.png | Bin 0 -> 719 bytes .../Standard/chemistry.rsi/assembly.png | Bin 0 -> 532 bytes .../Standard/chemistry.rsi/bolted_unlit.png | Bin 0 -> 191 bytes .../Standard/chemistry.rsi/closed.png | Bin 0 -> 687 bytes .../Standard/chemistry.rsi/closed_unlit.png | Bin 0 -> 184 bytes .../Standard/chemistry.rsi/closing.png | Bin 0 -> 2016 bytes .../Standard/chemistry.rsi/closing_unlit.png | Bin 0 -> 530 bytes .../Standard/chemistry.rsi/deny_unlit.png | Bin 0 -> 350 bytes .../chemistry.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Airlocks/Standard/chemistry.rsi/meta.json | 195 ++++++++++++++++++ .../Airlocks/Standard/chemistry.rsi/open.png | Bin 0 -> 376 bytes .../Standard/chemistry.rsi/opening.png | Bin 0 -> 2021 bytes .../Standard/chemistry.rsi/opening_unlit.png | Bin 0 -> 523 bytes .../Standard/chemistry.rsi/panel_closing.png | Bin 0 -> 590 bytes .../Standard/chemistry.rsi/panel_open.png | Bin 0 -> 341 bytes .../Standard/chemistry.rsi/panel_opening.png | Bin 0 -> 603 bytes .../Standard/chemistry.rsi/sparks.png | Bin 0 -> 697 bytes .../Standard/chemistry.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Standard/chemistry.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Standard/chemistry.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Standard/chemistry.rsi/welded.png | Bin 0 -> 719 bytes .../Standard/hydroponics.rsi/assembly.png | Bin 0 -> 534 bytes .../Standard/hydroponics.rsi/bolted_unlit.png | Bin 0 -> 191 bytes .../Standard/hydroponics.rsi/closed.png | Bin 0 -> 684 bytes .../Standard/hydroponics.rsi/closed_unlit.png | Bin 0 -> 184 bytes .../Standard/hydroponics.rsi/closing.png | Bin 0 -> 2122 bytes .../hydroponics.rsi/closing_unlit.png | Bin 0 -> 530 bytes .../Standard/hydroponics.rsi/deny_unlit.png | Bin 0 -> 350 bytes .../hydroponics.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Standard/hydroponics.rsi/meta.json | 195 ++++++++++++++++++ .../Standard/hydroponics.rsi/open.png | Bin 0 -> 374 bytes .../Standard/hydroponics.rsi/opening.png | Bin 0 -> 2071 bytes .../hydroponics.rsi/opening_unlit.png | Bin 0 -> 523 bytes .../hydroponics.rsi/panel_closing.png | Bin 0 -> 590 bytes .../Standard/hydroponics.rsi/panel_open.png | Bin 0 -> 341 bytes .../hydroponics.rsi/panel_opening.png | Bin 0 -> 603 bytes .../Standard/hydroponics.rsi/sparks.png | Bin 0 -> 697 bytes .../hydroponics.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../hydroponics.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Standard/hydroponics.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Standard/hydroponics.rsi/welded.png | Bin 0 -> 719 bytes 84 files changed, 812 insertions(+), 12 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/bolted_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/welded.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/assembly.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/bolted_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/welded.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml new file mode 100644 index 00000000000..67004211317 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml @@ -0,0 +1,19 @@ + +#Chemistry +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyChemistry + suffix: Chemistry + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi #Delta V - Resprite Doors + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyChemistryGlass + suffix: Chemistry, Glass + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi #Delta V - Resprite Doors + state: "assembly" diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml index 5b82b3bb519..9c14c3046b3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml @@ -6,11 +6,11 @@ atmospherics: DeltaV/Structures/Doors/Airlocks/Standard/atmospherics.rsi basic: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi cargo: DeltaV/Structures/Doors/Airlocks/Standard/cargo.rsi - chemistry: DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi # TODO: resprite chemistry + chemistry: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi command: DeltaV/Structures/Doors/Airlocks/Standard/command.rsi engineering: DeltaV/Structures/Doors/Airlocks/Standard/engineering.rsi freezer: DeltaV/Structures/Doors/Airlocks/Standard/freezer.rsi - hydroponics: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi # TODO: resprite hydroponics + hydroponics: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi maintenance: DeltaV/Structures/Doors/Airlocks/Standard/maint.rsi science: DeltaV/Structures/Doors/Airlocks/Standard/science.rsi security: DeltaV/Structures/Doors/Airlocks/Standard/security.rsi @@ -23,16 +23,16 @@ stylePaths: atmospherics: DeltaV/Structures/Doors/Airlocks/Glass/atmospherics.rsi basic: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi - chemistry: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi # TODO: resprite chemistry + chemistry: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi command: DeltaV/Structures/Doors/Airlocks/Glass/command.rsi science: DeltaV/Structures/Doors/Airlocks/Glass/science.rsi cargo: DeltaV/Structures/Doors/Airlocks/Glass/cargo.rsi engineering: DeltaV/Structures/Doors/Airlocks/Glass/engineering.rsi glass: DeltaV/Structures/Doors/Airlocks/Glass/glass.rsi - hydroponics: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi + hydroponics: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi maintenance: DeltaV/Structures/Doors/Airlocks/Glass/maint.rsi medical: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi security: DeltaV/Structures/Doors/Airlocks/Glass/security.rsi virology: DeltaV/Structures/Doors/Airlocks/Glass/virology.rsi justice: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Add Justice Dept - # TODO: hydroponics sprite + diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index d33b1d501ff..168720eaef3 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -46,7 +46,7 @@ suffix: Hydroponics components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi # DeltaV: temporary sprite until hydroponics is resprited + sprite: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi # DeltaV - Resprite Doors - type: Wires layoutId: AirlockService @@ -76,7 +76,7 @@ suffix: Chemistry components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi # DeltaV: using medical sprite until chemistry gets resprited + sprite: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi # DeltaV - Reprite Doors - type: entity parent: Airlock @@ -210,10 +210,10 @@ - type: entity parent: AirlockGlass id: AirlockHydroponicsGlass - suffix: Hydroponics, DO NOT MAP # DeltaV: DNM as its not resprited yet + suffix: Hydroponics components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi # DeltaV: temporary sprite until hydroponics is resprited + sprite: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi # DeltaV - Resprite Doors - type: Wires layoutId: AirlockService @@ -235,7 +235,8 @@ suffix: Chemistry components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi # DeltaV: using medical sprite until chemistry gets resprited + sprite: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi # DeltaV - Resprite Doors + - type: entity parent: AirlockMedicalGlass diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml index 9c06b33d3a0..4a9c4472efa 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml @@ -145,7 +145,7 @@ suffix: Hydroponics components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/hydroponics.rsi + sprite: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi #Delta V - Resprite Doors state: "assembly" - type: entity @@ -154,7 +154,7 @@ suffix: Hydroponics, Glass components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/hydroponics.rsi + sprite: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi #Delta V - Resprite Doors state: "assembly" #Maintenance diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ddfc23c9b3f5fb278768c6b387625ebd76847c GIT binary patch literal 543 zcmV+)0^t3LP)Px$*-1n}R9Hu2)YCWq|NYx{26Vv5#fc(x>Ec;N3`Il;fXqi$hHMwe4n~lI)kzjO zje39K0K<{TpBYN_JR-{hnVFgYJv=-ZcI?=}0HPHY72$Tp#3n)|lfds1O3lzMh^^N{ynJBnQAO zN6rD17R9(6pr)$GaO?JcL>i!%<*+Eg>Hu2%92W6d(*QLqAZ)>oT-njw0iae8de%dB z0IXF6ZxMmY0cwW8pl|@F{fFEN!q(WZ`11uuwj zsUWvQirgOrwR-RYaC;yyzz3}6>eZ`Y8dOb!05u%|s{KGfTU#6Mp7k5HK&oS0-E(ps hfUirA92%hRIRK>0kssWuk9q(A002ovPDHLkV1hU3@Z|si literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..653846c3022fe943b97fb6a5d9f2b8a86147e70c GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D46K! z;usRq`u6%l-UbH&my7i>Ox;$F%oe}iGkG#|7(|>&&1{&k;M||7lh3@{JX@)0+GW$d zdJYW?j7%&X0tyfY!{6u~=QO?A3=apWy-R++svs<4n@2qN|FYoM-~TZFI4EQ7u(DVc VXc>d2tDnm{r-Y`r$KSLd^8sfVKOO)8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..6de0c21baca26f9d75c63ea0933bb17277e4e13d GIT binary patch literal 696 zcmV;p0!RIcP)Px%a!Eu%R9HvVmoZ2}K^VtRB1j>~L7ajFUyD$pLk$frhKplMlu<-2HAXHu*kVgd zLDZH*i=z#KOG5=Uh>J@K7ER({5M&Thd`~~Qciz2sr_Z5V-h21%zVG+G``&l|bIi;MV8jTX4 z&u40;hoal zDgeA_K;QktQ#%K;oAbI4NGKYB=N#S-3V=zvy0*~aOeOszhXB6q9hz-3CsW>0S!rrl@KTOlLJd9H>6M~bn5_AMP7qSi8OE~r z7K@QwF4wIk+r=?%1n`f8>X~VH_OX$HvL3J#Kw1v~EpAA50$`+sdI02kqU`C)GMr!~!(^Ah5&#Au1Z&hx zh~oP4LgPew_o{6@zQPB<%_9&9^w=zy%X%Mfu`GbfTmt}lvN~4N eMC|dr-?@LvYA`O&W6Yrd0000ZPM z;usRqn*8VgfBVA@Ov@Oz)?Q&;%qLNLUK=vN11Qa0#Ha0e~oTm9{hX2w7 z(-R&DJ#Ox{v;S3j3^P6Px+kx4{BRCr$PTs>$dRTQ2ef)OlIJgo$SiG=}ojlx=3*hC^2&|*bIR}8rD5Ibdq zuv@H+BG`xsTL^ApvxP#o2*kodMFqnuq%ncWTImWY1XmD=e6xFI&zyJfopbKoI}^!F zlf0Mr=KJpX?%z50n@l})?2&`(e_b!8@0>39_0x|(Ox4~<_yU;xcEHD#n}ft94usD+ zrQ+giE46nDAGoyoScScR<;&u$U;ixL_~L3d0mkF;!SeEQarWH#5|`uSbuJEsyRorR zgz&i#ZMjIy+1c6Z_AkElN>K`MVe#);|L$4+5g6?=KG+1n5zK)nlWBGpo-PCqMqS(-A

+9>q-w6REFrH6yXwpXTiBR zGzmb#Pszn6zytHM#m_r?lhx4Ng*Z;=;Y=rZ_x z4(8?H92`P{@a@8K1>d;_AOJZU&KI^&4Vl#u8U7B7Yk;&2J|feRR+N$ zw$VO8UBLhzE|i0DJ^Rel<TZ*|f<5 z&h6=`IW*bBLD6SVkL41= z?TWGzU`fj-B%Xfa**B!Cs4^WXw#?o$)s(c)^cf8w>$qwl(`UinZW zg8TDK5U=?@{KD4nQCzf`gpZ%p0bBxDc|ZVO>7`_kx0hqr1i+c>{NnN3d;(Z)<4u_$ zaCj+z1fWL8aM5CF1c>3`69Ao!+Upg7ic!D)va>Hmi1Erd1w)nsNPu^5KUsAID;F)M zYXo8jcyKgbt^>GYc!UISjRw3|bH=$E3^IKP5W~eP02WG_31dO!0$6xh1eiDx!w9f| zHI*!yg5jHjsOQCS(PFx$AXy8F;bEPEXbq~IaWRedtr^+{k;=hx3X0*P#q3%D-y+<( z04}lQHZ-Q^(P-3GAUO};HaLcd909)0De*fS0f$Whz6yq10XvdVb}729E-3f7=r-pL2b)$YuW`hS+ZrX zNHGE|n1n|@eVGZzjDVGumGV%FatZzn0BU1Zd)7!E7Ud zkB3hH*M1Cu1TD9ooPg_;h>BsMH6SE_)`u?xffFff9^m33_x?@o#oq}# zmJoySe@8G-N%cowrB>?&3`G>7ud95d& zFmQkJ=i@ypT5Y5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..7498990a390fff5bc731e3baf307858de3ba839f GIT binary patch literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DY|LVWJZ)g7gayQ33 zC84efpUW1jM3zjpl9GRBGrjV(w^{7`kH3`q%U{Rq-`5M@{OZ~IpC|ve&)L0trt>=A zPcLuPUCx)6GP(UU;|BX9pS;|%U4_qp!OP(3>gTe~DWS>x#=icOSELqHvM#qqt^fe%s?IS0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..8c381d4c61eb53553f4e9ee9184c0bb067df59d0 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^2|(!}C>Tt7pBL_kH(w{qxKbdX5In2Y48a8O|_Z zGB&v0KYDjrl(~P{=aidki*4nKcB(J0-gI|+mFWZX?{!9Qla?D+eJlE(RkwX{B3_fg zW=q#LEc`$JK_gGjm-qu0usILv@}Kn#Hv4a1+`#^>bGptP{_Z|tI5Bv-`njxgN@#*J E0NvYmaR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..f210ecf123ef7c095416ebee9a638fb3f5962b80 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1W>TY z)5S3)qw(#{g}jFocvutvhXyz%gr7*0)ta5!dZ=NM7a#X3FD|uWcPeou7pDTI=K8KzA{C zy85}Sb4qARKO}_AZSOoD*7PCC#DdqUUT4YBha-GG5};EA7)U z%Pl)B#5S^UDv5*yxNw>++VW~igvX`2Gl%UT{8BB_e4^DfF_|$nV?wO`5BWduuATDj zF`wjQxZv~ALc6wx19}1Lt|H(?D1tSL*h@TpUD=;8v2n6nFZwC< z9;nU(9BcR9o?gh?;K0CgP}woj;EO|MyztUm{(J)sp$QTODjI1|V$FW;eD^Y9y3F4> lJeRlT>fX#Yn)dshFEc1Wf#AM1V+lVW(~eWB5g;xs!~xDe=FtEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..d8485a48e747fdc9942e8737df6cf9f00309df53 GIT binary patch literal 377 zcmV-<0fzpGP)Px$Gf6~2R9Hu2)YCWq|NYx{22L(c24ryQ;#o!%0V;ApcEXHf1aVd;S-_2df8hYb zk;k7IO7=XWnFBI2Gyi*dcret~H8Fr4Fw5u%ivQ^D0A+LE4uO+XD$WWbZjE2By2#lBz$jr=Sh>1;vl!OCO4h*OR67@y?S0sfqgw8vG2!Yqr zQ%dPo6k|95R2RUCVR|G&3me literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea40202f1cc43fd14fabefe610d7a83be759a6a GIT binary patch literal 2000 zcmV;>2QT=EP)Px+ib+I4RCr$PTuo?QRS>>G1S7b};^|5-n7A-tYZU6jg`1QV4CtaFq7?%c9^y`E z5Yk26R0?jS6uJ=Fg_|xE(nTOHT&SpEs6sX-5UDGzkcD6ck;vS>xt+|LIcMhFb8Z&B zZFf{+)bqQY{m^55G26o&xb}fBxym3HYAY z1OAWQlitTu7VeFhS^%tEfWrh7J~g;iJ^$!K)zr}!qJifH_HKMtef`^C)$F^URO{>O z)#Bn}H9b8YywC3LZnd+sQ(d|GSzYeh@^i_!?|pf*7GO9W?gO@m!|K^{E_|#jVrrzV zTwZ_Ut%Cx%qcFOF3t+hq72xvxKbA|z$^fn=faQiLfCryqS_RO`0sesupam~){!#56 zd*{4%@znPhS5D7ATz`!MKu~99X6n!2J-*;G{GWc089)Qz#pMEcIG_N}RySRBwPrw! z3)Ei}0D~|)fAl_0fbGp2|DE~w+Dc3SE=Wj#6kLk{8V3~M@ncKpJ#}p(0Iz>70JMN7 z2b1+U0I!ekKiLra{nzb1F2W;^%}#j)kg@?j`{vsp>RV$5q~KZwkT_rlE)G{O01sN1t3!>d|BLE+SuqAp( z!7NAvq+00Wl6; z3LtT5rlHy(+@=c(RUW#k&>-x=4Rt{=4s;Ms!Ssv)K>=_jjD=GA;^QA*uQoO|nsorI zNTnC7R%suYa}XX5hb|5!Gr+xKLzUJz!~}?8YGZ(hi%S3`L|4H;0)is?tc-gRyhc*fFFv{WSrsxVZ(8&V+egV^h$q0ziN;7(A$< zgLs_Xz+Zj{!(9lqK?7Zw&gm)2$B@FvBY2)I%Pq;No2M9dmVF)f3zmCJ#J81Bt`BKhIDv$Yo! z{XL#*-#qnNBY@{RD2wJ;>cLFm;K7X=VX&Pj9se{3NVtF+`B#c3$w=fbpdq4xCB z*g*l%o=ppR_d=|dhH})N4gVv4E=(&Ix*1m*J1D@@Ctm%47D(BSwN_dZ0Pu5STDkNB zj2_bK1?V&2Lf-`mk3FRh{CyWhA`sdo#6Gz1f;#SkP@i6a(R0G3XF-}(8+S0f%mB*e zFlRx)quGw`1z7ET5bjI>i&ws@4B%X-HL=TC5b`+r>34UwqiF`Ddg8U2heZHf3G-(T za?gT70+hz4@lge6W6SmmK&|T_K#Ch#!?be241m2TbbG+Hr8nb50lEr4RFFSA&_w`3 znMi$6T?HS`nc)<&>4IWD{I;!)UeB%Tr2`OpfCG5Zr*?98ds5ef&(c90Q~}zw1g}@V zWB@D=O#ptI`dS*NmVreCuv)eGk9Cv?LWm1JkST%9x1jlYs5ueKJq_#y7|#hQCPf9X zc;)$#V2M^}*^BC;3zB&B0*rpNuNPqSqkZ>m2IM}IwHj6XE@-qHN?j4u|DQT1)&$^o zZT_o?U1k7xXP3a14&tdhWb7F+xPbcqa|$4NMy4#D?OAQ+z-G0000r!*NB(N6{u{&8AC^P5KXhi=Din&atnNV^>;%mgPAw zldDm62mjBWd{4UWL_t+>N?M2UBJ&UTB^lBfW-unOHDF_G+y9!i>-gcG#~n6Rx@_xp z+4Lo^n8*D;Cs&s(Kl|O%5C0jatyjRQJB=aYy~VCor*qQJ7aH8_zHHGyy`ro1_R$@d z-5nL?tKVL`d;GTj-twIp`{sPk+x+hD*~4!8FK=(Jv_6@8{m)5bU2)%s7E;f&Iq*1; zIH?;NN{_6TRo^;f?>YmtWc7?^v1cw6e+-TN*IE3tPM)Efxzo9F)|+XM y9f6_F;OXk;vd$@?Np9NzZ>KuvbxeGz+u_4_LZpFW;thB9@(Ho^#~hv`+XDdgl*e%Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0d28b65b41e952ff138206e67c2eab541e97bb GIT binary patch literal 590 zcmeAS@N?(olHy`uVBq!ia0vp^2|(8{u8~v8D4VHsbO6G zfVso|4c8&1BjN!kB0N|OU4!0~Gv5ndX6fx$roOr6aZ- z1}+D8Mh=mwTHm65f$YT+y$l)*tpc|q)?a62$bORjbN!B}<;)J{46?aLPQ2j5WfxWl zzy;Ha9X%(xy#KrYJX>?)=CWs%eGdyFR+UR`zZr2VN9~_N{jt6Gk2?PAnJwY{SLvDM z`@edd-mLt>(7nr7{jpQV;rKa^1@7->YujunH@iZ-boN@t%`<;2o-C68e!BhVkJrvE z3evs1yXSU|;J$sc7FDOMPPG6kvTf?}5?y%p$g^LX$F?7+(_U_op8Rn2BePiMu8SPy zx2>n0vOl+0w0Jfv$HLzJlhS?q=NND39Qr)x=xgtn_fqdn<97>xU2;dom+?U5d+-0+ z7UwOkB{pj1eP))D-aBvhl9%6~Eq>B_!zO+0ZPP-%SJ!?r7*&b8AOaumcP@u#+`hMN Wo}Z+2=^ZeEFnGH9xvX^(3p31-d+H}+6gk7a`|=pK~c0c-aIha zzO!7dxw>&|Uhi41)>Khve*oXHc-WHM{awae3#zDt9bItJzomGD@u;NA^Zfw;RC&(R z+4;}<^cRgc0Ba|_)f=v7Q{dBt)ys2B=hFkG8^@-04#0?r>Gygqk=GUg9M9*bc1{7h nNn&>QP52cDfB+Bx{yo44RP&P*c~z&500000NkvXXu0mjfWXh0Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_opening.png new file mode 100644 index 0000000000000000000000000000000000000000..899651c30446a8998f9b1fabda944d7360df9810 GIT binary patch literal 603 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1-DY*PN^juO zbNHjE%+V}hzTm-T4o;1<4LdFQi}tCdblowo`Fw9KPk9UnW0QNUY{Jcn3`Rl@ZcHaU z7$i9rlo?Z08hThJfCbZzzG}a0!s|KdkHxg-mcRb)+q_CLxowlq-njFYtJ@2|{)%I0 z`1?ol`^k52icPAbZk#+mVWG}xUygG*tPBm`bydWlTO4?D>b4A@?rGQAiE&~FHn8W^ z)joPy*mC$WPyYMq6%{fISA?uRXj~{9oWXc7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1P8ZNkY>!D5Xf# z6r~g*LKudVwY)h1P1ErG{Y_O>7-LwiR)`353_Ys?Q50dVWxL(toFmV3j4>Ev9Ps-l zJRA;eHXCkkZUA_Cdcya8uCA^oYs~_vstSOYmlptvqL5)2-05^$24J__0pOg&T1%E? zSZlG?E(5S$uW`=d`##P&PNx%L7!t?vWUW~#Fvg&@CP@;4AQ;U@mSvOsz$}0yNe~gr zvZU)ew%aYf@6$BRWUX0O@bK^eKpe+o2Sh2w$H&Jq0Jpcd7-MkGk!2bD&AuCkVVOQq zRTXX9QdJel;}HO*6wbM2W`WlFXVbDQoiPRx!S|=j%`#!vby#aL#<+j-FCvo*Fs}mF z*VkBUT~QQ-VTg#xI1v{CD2f856iw4m*R_me`SbI08GyR3UElW{k4Mrp#q&J0)~wg- zWdO9+#Bq$Zmb0@nHk%D`9JAOk8XJyMilQjo>+7qG#+c^-Y=BO>H^PTRIWSFs4d+uIvimN{b#&(F_dttCm4pMS((2iWa)^nH)#d1G6q zEKBzL{W1VwUta`4Al6#<`1tq(<9X9PE&uy@{s#~QNIZEt|6~9F002ovPDHLkV1nDB BNt*xw literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..7ee614586b62968924a90ea3001813467403f201 GIT binary patch literal 554 zcmV+_0@eMAP)Px$Ec;N3`Il;fXqi$hHMwe4n~jyDce;z zjk~)eH|#G?3*0u}HE17Ev+`Czd^70MYu2#&EkfMxTQ?;FHWE{C=UL1CT9x zP{RmufU>!72f7RHeqyQk^f?eBOa%vAI`fV}&qN4p9Ec49d>e!z4)DmV?M8RN?Q<9Y zo_`uzK^F%YdPYbL_=ne7@Gq?wI2v*Yiq+D sw0^@Dhy!qS&&hQFzAia(aDck!0CNdiA1fM#3jhEB07*qoM6N<$g3qPiP5=M^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..653846c3022fe943b97fb6a5d9f2b8a86147e70c GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D46K! z;usRq`u6%l-UbH&my7i>Ox;$F%oe}iGkG#|7(|>&&1{&k;M||7lh3@{JX@)0+GW$d zdJYW?j7%&X0tyfY!{6u~=QO?A3=apWy-R++svs<4n@2qN|FYoM-~TZFI4EQ7u(DVc VXc>d2tDnm{r-Y`r$KSLd^8sfVKOO)8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..b3800c1537ae784005735e5a85026c9ad57ed954 GIT binary patch literal 713 zcmV;)0yh1LP)Px%gGod|R9HvVmqAM#K@`VdsE2N#3)VxWDkMl$2qd);EEJDk1VInESkiA%2-Kqo zKSWOr^w1pC3SRUBC}^reL=z+)3}_)1wvYr-EN|Sm?2a?LGs))QT(a4ndGEJx-oE#r zNGhFq0DH8WExHW+HKK-ePLLh<+6V$z#yr447AE2^10C}dPHSy|MiEk9f5GmLOZc!f z4C#2r*UnMx0FL)>z+4{y4}i9JTEGFQ*a-wMU#-EYdABMvc5e0Mt$&M;k8J=nnwome zZs9czyhs1t&!rI{=ZW|4UdRBdrNjH*^=v)}fCmx+T(!p_+CR?n0LSD|ah053UsV6{ z5N~3MejNZ&G@6wr44#ZU=D^#TpUekKC>MapIX>?efRc3MQ^`)k;qRW8qzHrs;LZu! z0=##z9O*p(Iua#e&jD0EMJEEXB21g4M58~l|Nr@&OSP&SOzeb zh_gABYK{GN1whU{RnYDQA^>zwj_JB%03GMZgj*0gfXbWG##0W2wgsa4&xhTeb)hGr z2!Q|g-2gIGgldR-gH|2rDS%2TR%yX1^`G8eTMvW@psWXwmKsu+02C>y9zc0++!h>J zMhk*unCcb;0^kIK;EnnTQC|7Dl`yZ0J%WT!LUJlPsE}^-lj6Jr5=nAjJ)jgy!C63Q zojvKv!33+C&cN1-$1yaN%g*X7Wph!ycnT5rX5A56d0^*3)c3l>T4;y?sCgul$tO0; vZPM z;usRqn*8VgfBVA@Ov@Oz)?Q&;%qLNLUK=vN11Qa0#Ha0e~oTm9{hX2w7 z(-R&DJ#Ox{v;S3j3^P6Px+#Ysd#RCr$PT+eG=MHHT(3sdkxEkv;u8cNzqAhkcBg19WGSZo#%qr|QF2MEPl zaM6X}zu?M%3$tkbfg9b4Ql+i75UB~0EE-WE6`qh3QJ$QecP8h~Ju`D=?##WFckd>B zulL^XoAb@DGxNluJu)Vdd#`laXdfmEteXR6F!ViE+UkCVb<>p}GA_v5$oKkVI zl@-f71~)wZ?8h4W_S!wAHkZ`;)pxTAFfl(dc>2`?YWoe6)n^2b|ue}1N!r3ga+%tUi@m=Fj6Nf-nn6&Dke6#&*k^fE*f zYe9?vr7SoT2cG~K{FGd50vw*2R4c1%%xY-vg*Z|Rd)uECEv|_Q;Hrr@38<_`)vO2{ zCbj@xfCht4`{2@Ya0U*pKv-vCnS#%DK}7&E6r2uht{SKX$iTrCd>V+<(_j~7djiZ) z49xj3?uca-fWf7SP>wtV*1F8H(#nXtV&xsN47IP+0y+V7I9d|`_F-{13fMH&0!-W{ zT7V6cR!Y4V)W{ex+=%Z4*p;9YVCc$7J_s|Fjn;hH0(V^z4U7TzYZsJyPnz3?>;xD( zAutfo6@n`P6G8kwg)zY<0Jk z;4TPi04&iqVMm0TurPO~Xz{oqgEcS*2O12-#qP$$r~PytE-p-pp%XFPFJ?64Qj6YW zKRv;XNyT@mO~Hr@yHKzL6>`OLk(L#>6k|Z!0^rJEQvv`UT(BGr*X+3$i@(du%cbvA z3V@i?)6=>RT)y)8jsR#+j|G&}D$b^j7I11$PtCz+4+rixdwMJv7bcArlwS+r3Sy{N zK7@cR05(20E>cW$&+f{fYaiKj4?#W*PkypM2^ zVzT%{0Yc&R{hLdQ3Ltq;NdWcatUA>Dr|{@=SEyIssi6~4KTQ#0yz;(am`edD!14V{x*~*fkz#T!@V9%1)tvZWv&(!L3IGFTB@>4OibQ}A9w7o$cEq3sgn;>$EPTPRbwOD3 zVz@{#*)GU9q!_~^vPE+aTPy0Nem?PD4`*;F}KGrok~h z%ogCo9(e)iEX+0thjfJ@0swaQLD=Srr!@mtC(T(_` z!G=C}0Pn^#0A@=->{1?(V-S`EqZ5D})Q+ijwtmiM$u^%$(gHj_e2S?PzoAdRZ)CzT zE#T;>gIjfYJDv%J)X=@g)j zSKjA|hoI9<7@q(VE+Lq)0=Rf^0?;zzzeNH_3LMh?z`f8UIYPb`AmJkM;ZxCL1PBSf ztGr?XVor%jtl*(tP-Q6uN=KKWnZ6$@2lm6ZZUFyZG6vXqm^ELD?HmK5)_)vMMnQnk{eYAL zu=@d^5N5+|3n1kp^ikxT&a+=DeDXB0W8HtarR{ORDZT@)L0`T2ZE-{##E5qCmkn)i119QQz48kdXxHP6ah%#m| zW-RK*@pXIbEG)*DH8f+zVwds&pEXe8m6v+rxkSu|PoJS&VlX*;Sc-tGHsk^x*aFOR z2a@-|k4EVeGLi>;PT>$wyadm64{}L`2?F2`hlFrDcxh1hL0#t^Z13xz+uRiZ{qgkX zP_H}}49*je81R1d=fiitd*L3u-z7lEdyoqiAmn*dfRJZP0!ZxCz7`N_4~N2==L00Q p51v6TF_?&v+Me!DY|LVWJZ)g7gayQ33 zC84efpUW1jM3zjpl9GRBGrjV(w^{7`kH3`q%U{Rq-`5M@{OZ~IpC|ve&)L0trt>=A zPcLuPUCx)6GP(UU;|BX9pS;|%U4_qp!OP(3>gTe~DWS>x#=icOSELqHvM#qqt^fe%s?IS0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..8c381d4c61eb53553f4e9ee9184c0bb067df59d0 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^2|(!}C>Tt7pBL_kH(w{qxKbdX5In2Y48a8O|_Z zGB&v0KYDjrl(~P{=aidki*4nKcB(J0-gI|+mFWZX?{!9Qla?D+eJlE(RkwX{B3_fg zW=q#LEc`$JK_gGjm-qu0usILv@}Kn#Hv4a1+`#^>bGptP{_Z|tI5Bv-`njxgN@#*J E0NvYmaR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..f210ecf123ef7c095416ebee9a638fb3f5962b80 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1W>TY z)5S3)qw(#{g}jFocvutvhXyz%gr7*0)ta5!dZ=NM7a#X3FD|uWcPeou7pDTI=K8KzA{C zy85}Sb4qARKO}_AZSOoD*7PCC#DdqUUT4YBha-GG5};EA7)U z%Pl)B#5S^UDv5*yxNw>++VW~igvX`2Gl%UT{8BB_e4^DfF_|$nV?wO`5BWduuATDj zF`wjQxZv~ALc6wx19}1Lt|H(?D1tSL*h@TpUD=;8v2n6nFZwC< z9;nU(9BcR9o?gh?;K0CgP}woj;EO|MyztUm{(J)sp$QTODjI1|V$FW;eD^Y9y3F4> lJeRlT>fX#Yn)dshFEc1Wf#AM1V+lVW(~eWB5g;xs!~xDe=FtEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..caec4c3ed67874cfa78c6062985844323482efdb GIT binary patch literal 380 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0d28b65b41e952ff138206e67c2eab541e97bb GIT binary patch literal 590 zcmeAS@N?(olHy`uVBq!ia0vp^2|(8{u8~v8D4VHsbO6G zfVso|4c8&1BjN!kB0N|OU4!0~Gv5ndX6fx$roOr6aZ- z1}+D8Mh=mwTHm65f$YT+y$l)*tpc|q)?a62$bORjbN!B}<;)J{46?aLPQ2j5WfxWl zzy;Ha9X%(xy#KrYJX>?)=CWs%eGdyFR+UR`zZr2VN9~_N{jt6Gk2?PAnJwY{SLvDM z`@edd-mLt>(7nr7{jpQV;rKa^1@7->YujunH@iZ-boN@t%`<;2o-C68e!BhVkJrvE z3evs1yXSU|;J$sc7FDOMPPG6kvTf?}5?y%p$g^LX$F?7+(_U_op8Rn2BePiMu8SPy zx2>n0vOl+0w0Jfv$HLzJlhS?q=NND39Qr)x=xgtn_fqdn<97>xU2;dom+?U5d+-0+ z7UwOkB{pj1eP))D-aBvhl9%6~Eq>B_!zO+0ZPP-%SJ!?r7*&b8AOaumcP@u#+`hMN Wo}Z+2=^ZeEFnGH9xvX^(3p31-d+H}+6gk7a`|=pK~c0c-aIha zzO!7dxw>&|Uhi41)>Khve*oXHc-WHM{awae3#zDt9bItJzomGD@u;NA^Zfw;RC&(R z+4;}<^cRgc0Ba|_)f=v7Q{dBt)ys2B=hFkG8^@-04#0?r>Gygqk=GUg9M9*bc1{7h nNn&>QP52cDfB+Bx{yo44RP&P*c~z&500000NkvXXu0mjfWXh0Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png new file mode 100644 index 0000000000000000000000000000000000000000..899651c30446a8998f9b1fabda944d7360df9810 GIT binary patch literal 603 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1-DY*PN^juO zbNHjE%+V}hzTm-T4o;1<4LdFQi}tCdblowo`Fw9KPk9UnW0QNUY{Jcn3`Rl@ZcHaU z7$i9rlo?Z08hThJfCbZzzG}a0!s|KdkHxg-mcRb)+q_CLxowlq-njFYtJ@2|{)%I0 z`1?ol`^k52icPAbZk#+mVWG}xUygG*tPBm`bydWlTO4?D>b4A@?rGQAiE&~FHn8W^ z)joPy*mC$WPyYMq6%{fISA?uRXj~{9oWXc7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1P8ZNkY>!D5Xf# z6r~g*LKudVwY)h1P1ErG{Y_O>7-LwiR)`353_Ys?Q50dVWxL(toFmV3j4>Ev9Ps-l zJRA;eHXCkkZUA_Cdcya8uCA^oYs~_vstSOYmlptvqL5)2-05^$24J__0pOg&T1%E? zSZlG?E(5S$uW`=d`##P&PNx%L7!t?vWUW~#Fvg&@CP@;4AQ;U@mSvOsz$}0yNe~gr zvZU)ew%aYf@6$BRWUX0O@bK^eKpe+o2Sh2w$H&Jq0Jpcd7-MkGk!2bD&AuCkVVOQq zRTXX9QdJel;}HO*6wbM2W`WlFXVbDQoiPRx!S|=j%`#!vby#aL#<+j-FCvo*Fs}mF z*VkBUT~QQ-VTg#xI1v{CD2f856iw4m*R_me`SbI08GyR3UElW{k4Mrp#q&J0)~wg- zWdO9+#Bq$Zmb0@nHk%D`9JAOk8XJyMilQjo>+7qG#+c^-Y=BO>H^PTRIWSFs4d+uIvimN{b#&(F_dttCm4pMS((2iWa)^nH)#d1G6q zEKBzL{W1VwUta`4Al6#<`1tq(<9X9PE&uy@{s#~QNIZEt|6~9F002ovPDHLkV1nDB BNt*xw literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..7ca79b67e9fb918ef46a4277c33e6578932f9996 GIT binary patch literal 532 zcmV+v0_**WP)Px$&PhZ;R9Hu2)YCWq|NYx{26Vv5#fc(x>Ec;N3`Il;fXqi$hHMwe4n~lI)kzjO zje39K0K<{TpBYN_JR-{hnVFgYJv=-ZcI?=}0HPHY72$Tp#3n)Mf)1c%6eQ}4{I5s~XV|=XGdx?To#TL~cbp}mfQl{ys3M}YC??AR z$d=Q}0cxs>47YCI$E*uzZ8^w8peVrV0OSgY7CwhXJkB>r`$pyd#&gG45YT7XXv$7$^i>U0reZy5I#7E*0cOx;$F%oe}iGkG#|7(|>&&1{&k;M||7lh3@{JX@)0+GW$d zdJYW?j7%&X0tyfY!{6u~=QO?A3=apWy-R++svs<4n@2qN|FYoM-~TZFI4EQ7u(DVc VXc>d2tDnm{r-Y`r$KSLd^8sfVKOO)8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..49741d65a868c6c5ee09e83ec6afadfb6b386273 GIT binary patch literal 687 zcmV;g0#N;lP)Px%X-PyuR9Hu~m%mE`F%-ws%@zb5I$A7T1v&hIT^tl#Ds|{TAX?F(o13c@>nbj8 zZgy~StYD#w;E%yU1Sx_ZoYt{}f?(a0ckL@lF1aLnm!;QSlJ~jyzIl0xO-^NhNUwFi zI{2vkjVI#LF{*XwxiJ7JCfj6gWRMI`FDMQ31K#g1$kp2?$!s2ydc98a`8-Ld(}C-_ zu1g%pA;;Ad!T=as?@izVbk3^EQzO#npRfWGUS+pY#qH)g#r0YTvxrAqsO5ojH4X?uVN zK#{Jju6F^BX1*C?5CQ~9o$oU5T1z|Le-i*&6Bq*M+b&mv0nj)arAc%FV2((H+5jTs zIv!B%AO=7rLI?qPAPNA`1S3Msgh-7VFbTop!5L{Z8vQ%~Sy9v=Q=%pU^MI)cBLk4d zk{4m2P$0Eht-m!(cLTzyxZ}Xf)pk;R7QjnYA{w$Ln7kna7|V1Irl)7u`wazvHjar) z1OUd-Fh2hqK*u;hK?p(zp!2`%%Q5h%flx!hA3(g@Y1Ks{LLPwMdNhEnDuQZAD-Vcv zL1X~B^?<4d(8>S!^~!oc#{*D^(q)(~fL1*aB>;j->j5awKb!~O2Za>^B>)T%LFfR` z)vxT?2f&LE2Z$~zblu2nK-ajk9?%h!=q{i$56Ac}CXm%k8XUdofm|+UGSwRk#S2rA zz}alt_9|uXJ_z-_X-k^j{sQ4r V$RF5BQb+&*002ovPDHLkV1i&lB4z*p literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..cc185dfdb5a6afa911a8f78035710018819aaa1d GIT binary patch literal 184 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..8c381d4c61eb53553f4e9ee9184c0bb067df59d0 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^2|(!}C>Tt7pBL_kH(w{qxKbdX5In2Y48a8O|_Z zGB&v0KYDjrl(~P{=aidki*4nKcB(J0-gI|+mFWZX?{!9Qla?D+eJlE(RkwX{B3_fg zW=q#LEc`$JK_gGjm-qu0usILv@}Kn#Hv4a1+`#^>bGptP{_Z|tI5Bv-`njxgN@#*J E0NvYmaR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..f210ecf123ef7c095416ebee9a638fb3f5962b80 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1W>TY z)5S3)qw(#{g}jFocvutvhXyz%gr7*0)ta5!dZ=NM7a#X3FD|uWcPeou7pDTI=K8KzA{C zy85}Sb4qARKO}_AZSOoD*7PCC#DdqUUT4YBha-GG5};EA7)U z%Pl)B#5S^UDv5*yxNw>++VW~igvX`2Gl%UT{8BB_e4^DfF_|$nV?wO`5BWduuATDj zF`wjQxZv~ALc6wx19}1Lt|H(?D1tSL*h@TpUD=;8v2n6nFZwC< z9;nU(9BcR9o?gh?;K0CgP}woj;EO|MyztUm{(J)sp$QTODjI1|V$FW;eD^Y9y3F4> lJeRlT>fX#Yn)dshFEc1Wf#AM1V+lVW(~eWB5g;xs!~xDe=FtEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1e22de6b8b4260f018f94a159d14aef28b7f61 GIT binary patch literal 376 zcmV-;0f+vHP)Px$GD$>1R9Hu2)YCWq|NYx{22L(c24ryQ;#o!%0V;ApcEXHf1aVd;S-_2df8hYb zk;k7IO7=XWnFBI2Gyi*dcret~H8Fr4Fw5u%ivQ^DfH=|DUPx+pGibPRCr$PTs??gRS>@0nTVj^mIfC#f-D*_jfINM$_iOX3K2vjNfCI3T_A!Q zF}7l37ePphG!_On;KEu6{vd+l4~w7+t81A;K`?eJbN9`4-n^MJGv}W3UeNoR?0Y%) zeczey&YAP`-M8@YvE%#A_;u^ATllB>@1eto)Hc@l@N2F16o_B@{dZq4!2i>JzGwq1!gnL476307;IIIVPcPnV9>4Fd=AK8MG6T;W{Qm7H&1b*;*&KcO-DY!hvsqhP zYnGOllHaqtyW8yS>@-)dUTfQZaQ3lm-18srwE~PrqkX`RaCrUVr4T;$6)`o^UM?@Z zcxF<7a1_QDZ~;8uLj}0}=--}8rrH3mCV=M)QGf_O#qjx1Yh^_=3;yJ^g>o02+WOE*Bue0R?~&zH zO$lIe-~vQ3BLYZmyJ@IYgkcDRyTVHf7GhNKROg|cR)nLtxdPC22n<1yzUB-;Nda&r zjE!(Cj-=(&@7!p%wzj%;0IW!*7pzw47$_Ct2rd<1G#Z6C)Et65TwoTct^=Y)xTF9e zO0*!txa;XOd^g?%HH)x^i%S4)DB(qTeSN*z*x2Z%rsux7L%fvE`LEtwY}?S!a;KqZ zj@`Te%Gu{a9FSw_X=sFtngP~==m$zFIXP!X--pN(iC~HA4~rI*x(IzpV^N2_WHG0;D*21V~|Oqk|@Z#3d|%C-^`N zI#*JFXz)E8ECEUdKgA^^0NoSO?tHu}uyZAbAPF~h=X*J%1V~{WOPM6LiB2u0PHD$?EEk_ zqLdnfGy%N0|9Jr*KvFO~0#NsZ_O~X07uOQN%YpiW_zjmc3z9M*#ictD<3$()BpJ2n z{tq95ydBqyuou^J3dT?2EL)7#S8M+#bqc0&QEe%n*^J}`@?3{)a*bJ%87pTNL~DR$ z%E@nx6`y;%AfC<`bD#mKRBV`*T7B+p!wq?o_I?D$)<Npy)60cFA5arJDL{$cKyRm^9kpk}d&G|}|8p|{Zw9&f^Htt}~vItWy^UMI?(QQZ5m2izBJP0sZ8PG%22~aZw zJYM-(WdP?wpAV>Af2ah=DzFyjJ}^0w8`VOfMJe4XuqG5+KKx?d>$Q zc=#z#~uYAn_q`2UX0Qi0S>skG38CXRCuT@(z z=a#+$Q(WkQOl<)q9^FE$^nUyxz;sT`TmX+#SaL_#$N-JYtTTY~sG0$T0Mo1AL4fh^ z+40T5SrlQ(J33^*_-8BsHv(|`I{($g8Z!~iwanewHL#^)Na_xmdPWQ`p#J~dg6Q?i z&r1OA%9wiwNXD!_cZAm~Kg@#0Kin!=6Fr`IkNY6ymFL#PKA1UND1HrWZ3x1cbmsvY zdCL)ObvozSfn3ZITuNh00`Qo$TM_7w=l=g(Lej$ul2`u2>o;1C^jB4KF(U%-9}vN7 zOJlnQ(Cq2CguGsP$)28zsR`h<$9tXu@NBw8cmU=<9+rT_auD2w00000NkvXXu0mjf Dwk)p= literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..2e109950a4e524271fb36adb270f2c91f88feff1 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^2|(r!*NB(N6{u{&8AC^P5KXhi=Din&atnNV^>;%mgPAw zldDm62mjBWd{4UWL_t+>N?M2UBJ&UTB^lBfW-unOHDF_G+y9!i>-gcG#~n6Rx@_xp z+4Lo^n8*D;Cs&s(Kl|O%5C0jatyjRQJB=aYy~VCor*qQJ7aH8_zHHGyy`ro1_R$@d z-5nL?tKVL`d;GTj-twIp`{sPk+x+hD*~4!8FK=(Jv_6@8{m)5bU2)%s7E;f&Iq*1; zIH?;NN{_6TRo^;f?>YmtWc7?^v1cw6e+-TN*IE3tPM)Efxzo9F)|+XM y9f6_F;OXk;vd$@?Np9NzZ>KuvbxeGz+u_4_LZpFW;thB9@(Ho^#~hv`+XDdgl*e%Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0d28b65b41e952ff138206e67c2eab541e97bb GIT binary patch literal 590 zcmeAS@N?(olHy`uVBq!ia0vp^2|(8{u8~v8D4VHsbO6G zfVso|4c8&1BjN!kB0N|OU4!0~Gv5ndX6fx$roOr6aZ- z1}+D8Mh=mwTHm65f$YT+y$l)*tpc|q)?a62$bORjbN!B}<;)J{46?aLPQ2j5WfxWl zzy;Ha9X%(xy#KrYJX>?)=CWs%eGdyFR+UR`zZr2VN9~_N{jt6Gk2?PAnJwY{SLvDM z`@edd-mLt>(7nr7{jpQV;rKa^1@7->YujunH@iZ-boN@t%`<;2o-C68e!BhVkJrvE z3evs1yXSU|;J$sc7FDOMPPG6kvTf?}5?y%p$g^LX$F?7+(_U_op8Rn2BePiMu8SPy zx2>n0vOl+0w0Jfv$HLzJlhS?q=NND39Qr)x=xgtn_fqdn<97>xU2;dom+?U5d+-0+ z7UwOkB{pj1eP))D-aBvhl9%6~Eq>B_!zO+0ZPP-%SJ!?r7*&b8AOaumcP@u#+`hMN Wo}Z+2=^ZeEFnGH9xvX^(3p31-d+H}+6gk7a`|=pK~c0c-aIha zzO!7dxw>&|Uhi41)>Khve*oXHc-WHM{awae3#zDt9bItJzomGD@u;NA^Zfw;RC&(R z+4;}<^cRgc0Ba|_)f=v7Q{dBt)ys2B=hFkG8^@-04#0?r>Gygqk=GUg9M9*bc1{7h nNn&>QP52cDfB+Bx{yo44RP&P*c~z&500000NkvXXu0mjfWXh0Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_opening.png new file mode 100644 index 0000000000000000000000000000000000000000..899651c30446a8998f9b1fabda944d7360df9810 GIT binary patch literal 603 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1-DY*PN^juO zbNHjE%+V}hzTm-T4o;1<4LdFQi}tCdblowo`Fw9KPk9UnW0QNUY{Jcn3`Rl@ZcHaU z7$i9rlo?Z08hThJfCbZzzG}a0!s|KdkHxg-mcRb)+q_CLxowlq-njFYtJ@2|{)%I0 z`1?ol`^k52icPAbZk#+mVWG}xUygG*tPBm`bydWlTO4?D>b4A@?rGQAiE&~FHn8W^ z)joPy*mC$WPyYMq6%{fISA?uRXj~{9oWXc7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1P8ZNkY>!D5Xf# z6r~g*LKudVwY)h1P1ErG{Y_O>7-LwiR)`353_Ys?Q50dVWxL(toFmV3j4>Ev9Ps-l zJRA;eHXCkkZUA_Cdcya8uCA^oYs~_vstSOYmlptvqL5)2-05^$24J__0pOg&T1%E? zSZlG?E(5S$uW`=d`##P&PNx%L7!t?vWUW~#Fvg&@CP@;4AQ;U@mSvOsz$}0yNe~gr zvZU)ew%aYf@6$BRWUX0O@bK^eKpe+o2Sh2w$H&Jq0Jpcd7-MkGk!2bD&AuCkVVOQq zRTXX9QdJel;}HO*6wbM2W`WlFXVbDQoiPRx!S|=j%`#!vby#aL#<+j-FCvo*Fs}mF z*VkBUT~QQ-VTg#xI1v{CD2f856iw4m*R_me`SbI08GyR3UElW{k4Mrp#q&J0)~wg- zWdO9+#Bq$Zmb0@nHk%D`9JAOk8XJyMilQjo>+7qG#+c^-Y=BO>H^PTRIWSFs4d+uIvimN{b#&(F_dttCm4pMS((2iWa)^nH)#d1G6q zEKBzL{W1VwUta`4Al6#<`1tq(<9X9PE&uy@{s#~QNIZEt|6~9F002ovPDHLkV1nDB BNt*xw literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..5cf053a10fce635677c46a1152a0c411feb9199d GIT binary patch literal 534 zcmV+x0_pvUP)Px$&`Cr=R9Hu2)YCWq|NYx{26Vv5#fc(x>Ec;N3`Il;fXqi$hHMwe4n~jyDce;z zjk~)eH|#G?3*0u}HE17Ev+`Czd^70MYu2#&EkfMxTQ?;FHWE{C=UL1CT9x zP{Rmy0H-f@2MC8k#HrwbOK09O=$QzCjRUbkfNz5^!~qN%tr!mY^zZ}&!-#Q!LJLYl zg#=TpAN@iA<^WjSfZ}RoIp9;kTa-jd>kxohhRB8k?EqS*f%IyBhQ+IQ!^;8bZRX%W zIC|_9q#PJD4nR%_RLceGk^hZcTNrMfSq#tCd{5%wR^coOr9@R3z!edtMKL)JK(U-g z4p387WVm(vK4x7&YsA& z1AzfPU`1E2UIo*jY7*QxAhSn|%>kg=4+ONewc!q0zhMicI>yyKC)WY^y5z{g0qULu Y0GlTfA8_PT2mk;807*qoM6N<$f(>-xrT_o{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..653846c3022fe943b97fb6a5d9f2b8a86147e70c GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D46K! z;usRq`u6%l-UbH&my7i>Ox;$F%oe}iGkG#|7(|>&&1{&k;M||7lh3@{JX@)0+GW$d zdJYW?j7%&X0tyfY!{6u~=QO?A3=apWy-R++svs<4n@2qN|FYoM-~TZFI4EQ7u(DVc VXc>d2tDnm{r-Y`r$KSLd^8sfVKOO)8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..85f8f12a3b7c35b8dd20b51986f505288bf2aa48 GIT binary patch literal 684 zcmV;d0#p5oP)Px%W=TXrR9Hu~mp@BGF%ZD7n{_B?5yU@ehiaivhZb~kbP*JnE=v6(I_kG@QgE<~ zf562rprC?KcFJ z<8kdAlN^3+3<13O7C^EHnbeq3u{@#H=mNCLkUO}B`}0p&+ns}zR6bPBOXCSDkH3(( zOo9O5teqA}05)>W0IjlFPO{jW;{%}3Tw#(8VV@d~(SQEC-U7bz#KM{u!uz;qZZiSM zKuUn`?h=eoEDHj|l%rA?0F^b`^)^hu&i7(qX8nR~gas65(l8%Xj<>BXAOld4UhO^m zK{$6R>f(HgA5>;^0pMeTWZ~HRVJvz8+JGE{P5`niSX3KaU_L^e1yn(ZiG}waFK}1@ zlq&=wWx~Fa0b-zZ(uA|}T|ZuCZ&#H@Xl_3A^F(MK;4NSigpmNa9K%eZ1hvPr{?SZ) z?kksjbmCfNNOW#AcL9D3$$}_(W-2Y@4IRKzI>kWhZw>Z45&%KDpSV;2sGJm2e`o+3 z<;a9C7&(BD|1~=&$5RZ9)CKYdB%7U&x=4ah29S>)51^}xuo|MfAv6!DPC;Ymh zp+7_QP?76KRVgl);i{56ydJQLB*k06W*N;1JWMdFxiq|b=@gWT8!k)PTr6IMM1*&< zYg;_}WA8z%?_Ha>(^3P_<&n*112U`CDjTCKRt9icD*%ut)3cf literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..cc185dfdb5a6afa911a8f78035710018819aaa1d GIT binary patch literal 184 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..8c381d4c61eb53553f4e9ee9184c0bb067df59d0 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^2|(!}C>Tt7pBL_kH(w{qxKbdX5In2Y48a8O|_Z zGB&v0KYDjrl(~P{=aidki*4nKcB(J0-gI|+mFWZX?{!9Qla?D+eJlE(RkwX{B3_fg zW=q#LEc`$JK_gGjm-qu0usILv@}Kn#Hv4a1+`#^>bGptP{_Z|tI5Bv-`njxgN@#*J E0NvYmaR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..f210ecf123ef7c095416ebee9a638fb3f5962b80 GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1W>TY z)5S3)qw(#{g}jFocvutvhXyz%gr7*0)ta5!dZ=NM7a#X3FD|uWcPeou7pDTI=K8KzA{C zy85}Sb4qARKO}_AZSOoD*7PCC#DdqUUT4YBha-GG5};EA7)U z%Pl)B#5S^UDv5*yxNw>++VW~igvX`2Gl%UT{8BB_e4^DfF_|$nV?wO`5BWduuATDj zF`wjQxZv~ALc6wx19}1Lt|H(?D1tSL*h@TpUD=;8v2n6nFZwC< z9;nU(9BcR9o?gh?;K0CgP}woj;EO|MyztUm{(J)sp$QTODjI1|V$FW;eD^Y9y3F4> lJeRlT>fX#Yn)dshFEc1Wf#AM1V+lVW(~eWB5g;xs!~xDe=FtEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "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/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..9b0c28b3f9b2cfdab140c991bbc966e0c957de98 GIT binary patch literal 374 zcmV-+0g3*JP)Px$FiAu~R9Hu2)YCWq|NYx{22L(c24ryQ;#o!%0V;ApcEXHf1aYKnSHX?HasLMc z!`syi4^A}D%mHGNV*f3oWEdXQFfxE0@JVJ7s{iQj08U?s1B62%G`$_bpwY_k>EVeH z>;Q$9{|uK}{RS=sMjbF30s|2O>DB%W8>7!bO2U!n0QJcKMy@Rk&klz{LI6|}N{Om6 zfGZ+;6vgNc0M&+Y%Ll>%D77K2DfH=_CPLt}j@lxkbqEXw2Y}jvm(IK!xDXh1z-R~z-Vgv+MrRh&r8@@7 zhOwcp;DQL=Ac6JEXxSl!^#@NZd%_@bO%~o2gtP~sV89#z>z>on0mvQ&`4?s<099O; U5E3m{?EnA(07*qoM6N<$f|{|Gm;e9( literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png new file mode 100644 index 0000000000000000000000000000000000000000..9cbd551c278eed434aee2d0e9b3eaced077ef6c5 GIT binary patch literal 2071 zcmV+y2Px+(Md!>RCr$PT)%G}MG#(hIE5v!uuupB7fCEdawHOoG?Zx&KSE)ofK1CD5ekar zzn~%#1+O3wL_>){1|>+bWE3TZgOo%_=ux<^(;3a?W<57IyF0VD_Z~{_HF0wXIIZ9?{jDO zw%fk-uUopY?8_a0`cL_njkE_ej!S0@2@RCY~=*t zf+Phfz|{y4<3I(l)U}TQy#8K*zn`3P$6h?$3TTQD1l=Nl)EoBi?Yme0e9h|@dcbtz zthibMBo5dE-P*Ne`{#A-D*$o{JphxSPcmdkNwM0#_P)9Y@XBM7h9txVfMjmLEfoMb zApRRy!$eSo=5?(uKqm>2F&!95UDzT3%?Wrf_^p!!3vjgpNE{F!1dwtR*1fg>$mJ*p z@L5PfAfV;uk`5JfmI8!8HWLGE1oIGpa#0Jw`=y`NWQL&Jq(UQr1~=6MavUT9ESRzT z<2rygNU3a?hDu2oTeNgxUjcwvED2k2O9i0o5IO|SMF3n02k?R+X!FZQ?)v1XkS|{S z@h!1|JbLFh|GT&lE5M}!e0Jpn6Ne#(APtvae*HbZ4xlYjlY~bBj@laxK~)5>Ob6G_ zZ@Rm;u7|1V(!)>1%Ug5)gPZlHp{Fk&zIpMgi34)1J`FW+iLQim3!>vMpLBHH5EJ0k z$yFcZd-r!c!Cn#su;PXxC{gJchtNne3o%~T>^i`}rAUAlAqeYq;v@l};uv`Rp6dZA z0VLd<04WX{0aBRJSx`g(iHlhPP4IyjRIa7~*5GS6iRS@x7eG1>&;+7X z01Sk59-zUkApmfwodb${02cu4DUbiT-)YdbhM<@LTHI$|00@v242=NvWGVJN+5?oh zIRUgBs4s{&xRP0r)B{pn!huXD2{#dvj9UEMSULscHWcZ&PdpD$;%bi}Qw@M`hv({= z-T!HfVU~ErZ7G^;DtLi3mtmP=W0qjXDwze*9FR3;X%=FF0J(Uyj9IXmX8FL@GbZ89 zjf<8`eOWlXDX}I3uG9lcIN&TOXN{zov5L}TNG+GvLJYTtEs=zMbns%LzsGXz-lb^} zz;c~mMK^|A>cK4GV8P89a!a{{tq2qVH_y(TIn&{{v$NxW!!2emfaO{)faThh0G9h; z1wXv>Znmx^0_3MofM$PZlJc( zej3?$G`T(8y8O51BW@X_n{h*9j{=bA$gns5Zv>ExNmfgCpB{ktwJ^0@TGm8nHqPz+ zSbJZx2ZR6+`*y8hNKRos1i_+AGW^yKLTm`~=G;+$uI2r?5dd0XYoQ?c|4W0B^2&!< z$n)L3Q%Ip z)>azIaqBv4h1A5|<}L-4aO+>W17%g1NwAP#W>dXTaD_J<5WiVHRbkKd!d z)|QWNnHf$1rEgz)Sx4>eFFi7f0c#z|3@v~VlW-y?4naK#r78`TPr0K<0VBZ} z^cbw#i<-p{Bsk{=?ExCAwq#Eqq6fsd%z6moJVpVUwi#IHSu#Bv>X_5j$@F(h?|be<7|3#k9UbUaQSL(*pl<|RPqNOaywSoFvDXc6Nq zsM{Z6Kc4&lO9@F2D@b1XZ*TnIInuYPlww*0;4csfiMe_3L$kMIEfafy zBWX`B4Tjb$FWJ*eF=GMI+T%6P09b=g%S$`}^FJ}@OSL)$2&e!6002ovPDHLkV1kQ% Btcw5u literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..2e109950a4e524271fb36adb270f2c91f88feff1 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^2|(r!*NB(N6{u{&8AC^P5KXhi=Din&atnNV^>;%mgPAw zldDm62mjBWd{4UWL_t+>N?M2UBJ&UTB^lBfW-unOHDF_G+y9!i>-gcG#~n6Rx@_xp z+4Lo^n8*D;Cs&s(Kl|O%5C0jatyjRQJB=aYy~VCor*qQJ7aH8_zHHGyy`ro1_R$@d z-5nL?tKVL`d;GTj-twIp`{sPk+x+hD*~4!8FK=(Jv_6@8{m)5bU2)%s7E;f&Iq*1; zIH?;NN{_6TRo^;f?>YmtWc7?^v1cw6e+-TN*IE3tPM)Efxzo9F)|+XM y9f6_F;OXk;vd$@?Np9NzZ>KuvbxeGz+u_4_LZpFW;thB9@(Ho^#~hv`+XDdgl*e%Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0d28b65b41e952ff138206e67c2eab541e97bb GIT binary patch literal 590 zcmeAS@N?(olHy`uVBq!ia0vp^2|(8{u8~v8D4VHsbO6G zfVso|4c8&1BjN!kB0N|OU4!0~Gv5ndX6fx$roOr6aZ- z1}+D8Mh=mwTHm65f$YT+y$l)*tpc|q)?a62$bORjbN!B}<;)J{46?aLPQ2j5WfxWl zzy;Ha9X%(xy#KrYJX>?)=CWs%eGdyFR+UR`zZr2VN9~_N{jt6Gk2?PAnJwY{SLvDM z`@edd-mLt>(7nr7{jpQV;rKa^1@7->YujunH@iZ-boN@t%`<;2o-C68e!BhVkJrvE z3evs1yXSU|;J$sc7FDOMPPG6kvTf?}5?y%p$g^LX$F?7+(_U_op8Rn2BePiMu8SPy zx2>n0vOl+0w0Jfv$HLzJlhS?q=NND39Qr)x=xgtn_fqdn<97>xU2;dom+?U5d+-0+ z7UwOkB{pj1eP))D-aBvhl9%6~Eq>B_!zO+0ZPP-%SJ!?r7*&b8AOaumcP@u#+`hMN Wo}Z+2=^ZeEFnGH9xvX^(3p31-d+H}+6gk7a`|=pK~c0c-aIha zzO!7dxw>&|Uhi41)>Khve*oXHc-WHM{awae3#zDt9bItJzomGD@u;NA^Zfw;RC&(R z+4;}<^cRgc0Ba|_)f=v7Q{dBt)ys2B=hFkG8^@-04#0?r>Gygqk=GUg9M9*bc1{7h nNn&>QP52cDfB+Bx{yo44RP&P*c~z&500000NkvXXu0mjfWXh0Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png new file mode 100644 index 0000000000000000000000000000000000000000..899651c30446a8998f9b1fabda944d7360df9810 GIT binary patch literal 603 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1-DY*PN^juO zbNHjE%+V}hzTm-T4o;1<4LdFQi}tCdblowo`Fw9KPk9UnW0QNUY{Jcn3`Rl@ZcHaU z7$i9rlo?Z08hThJfCbZzzG}a0!s|KdkHxg-mcRb)+q_CLxowlq-njFYtJ@2|{)%I0 z`1?ol`^k52icPAbZk#+mVWG}xUygG*tPBm`bydWlTO4?D>b4A@?rGQAiE&~FHn8W^ z)joPy*mC$WPyYMq6%{fISA?uRXj~{9oWXc7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(1P8ZNkY>!D5Xf# z6r~g*LKudVwY)h1P1ErG{Y_O>7-LwiR)`353_Ys?Q50dVWxL(toFmV3j4>Ev9Ps-l zJRA;eHXCkkZUA_Cdcya8uCA^oYs~_vstSOYmlptvqL5)2-05^$24J__0pOg&T1%E? zSZlG?E(5S$uW`=d`##P&PNx%L7!t?vWUW~#Fvg&@CP@;4AQ;U@mSvOsz$}0yNe~gr zvZU)ew%aYf@6$BRWUX0O@bK^eKpe+o2Sh2w$H&Jq0Jpcd7-MkGk!2bD&AuCkVVOQq zRTXX9QdJel;}HO*6wbM2W`WlFXVbDQoiPRx!S|=j%`#!vby#aL#<+j-FCvo*Fs}mF z*VkBUT~QQ-VTg#xI1v{CD2f856iw4m*R_me`SbI08GyR3UElW{k4Mrp#q&J0)~wg- zWdO9+#Bq$Zmb0@nHk%D`9JAOk8XJyMilQjo>+7qG#+c^-Y=BO>H^PTRIWSFs4d+uIvimN{b#&(F_dttCm4pMS((2iWa)^nH)#d1G6q zEKBzL{W1VwUta`4Al6#<`1tq(<9X9PE&uy@{s#~QNIZEt|6~9F002ovPDHLkV1nDB BNt*xw literal 0 HcmV?d00001 From 18db7fb66f2f2fb3206fee62fc0c7cc3da20c9e9 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 18 Oct 2024 02:32:06 +0200 Subject: [PATCH 05/18] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 2f13997b425..a5f8d487c7b 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Altered the rules. Read the latest changes to them at the top of the - rules list! - type: Tweak - id: 112 - time: '2023-10-29T17:36:46.0000000+00:00' - author: VMSolidus changes: - message: Cargo can now order medical scrub crates @@ -3676,3 +3669,10 @@ id: 611 time: '2024-10-15T23:01:23.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2011 +- author: Unkn0wnGh0st333 + changes: + - message: Chemistry and Hydroponics doors have been readded + type: Tweak + id: 612 + time: '2024-10-18T00:31:47.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1995 From adaaa0e718f118a1c03d44c906a3c824039d464c Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sat, 19 Oct 2024 16:43:10 -0300 Subject: [PATCH 06/18] Fixes the Helix shuttle wiring. (#2021) * Fixes wiring + renames APCs * Delete the invalid + remove touch on APC. --- Resources/Maps/Shuttles/DeltaV/helix.yml | 46 ++++++++++++++++++------ 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/Resources/Maps/Shuttles/DeltaV/helix.yml b/Resources/Maps/Shuttles/DeltaV/helix.yml index 6b1a7a09809..c381211d118 100644 --- a/Resources/Maps/Shuttles/DeltaV/helix.yml +++ b/Resources/Maps/Shuttles/DeltaV/helix.yml @@ -366,7 +366,6 @@ entities: - type: RadiationGridResistance - type: SpreaderGrid - type: GravityShake - nextShake: 0 shakeTimes: 10 - proto: AirCanister entities: @@ -499,14 +498,14 @@ entities: - uid: 205 components: - type: MetaData - name: Treatment APC + name: Treatment / West docks APC - type: Transform pos: -3.5,7.5 parent: 1 - uid: 448 components: - type: MetaData - name: Cryo APC + name: Cryo / East docks APC - type: Transform pos: 10.5,8.5 parent: 1 @@ -559,7 +558,7 @@ entities: - uid: 28 components: - type: Transform - pos: 10.5,7.5 + pos: -3.5,5.5 parent: 1 - uid: 29 components: @@ -951,6 +950,31 @@ entities: - type: Transform pos: 2.5,3.5 parent: 1 + - uid: 478 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 479 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 + - uid: 480 + components: + - type: Transform + pos: 10.5,5.5 + parent: 1 + - uid: 481 + components: + - type: Transform + pos: 10.5,6.5 + parent: 1 + - uid: 482 + components: + - type: Transform + pos: 10.5,7.5 + parent: 1 - proto: CableHV entities: - uid: 107 @@ -1223,13 +1247,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,11.5 parent: 1 -- proto: chem_master - entities: - - uid: 140 - components: - - type: Transform - pos: 4.5,3.5 - parent: 1 - proto: ChemDispenser entities: - uid: 141 @@ -1244,6 +1261,13 @@ entities: - type: Transform pos: 3.5,1.5 parent: 1 +- proto: ChemMaster + entities: + - uid: 140 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1 - proto: ClosetWallEmergencyFilledRandom entities: - uid: 445 From ac03dda03f40d7e63283f37628ed38e4250bfbc6 Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sun, 20 Oct 2024 11:01:18 +1100 Subject: [PATCH 07/18] Sec Star Returns (#2022) * STAR :3 Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * Update role_loadouts.yml A Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> * Update role_loadouts.yml Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --------- Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Prototypes/Loadouts/loadout_groups.yml | 12 ++++++------ Resources/Prototypes/Loadouts/role_loadouts.yml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 36ffaaa138d..e29a7abd9c0 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1288,12 +1288,12 @@ - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen -#- type: loadoutGroup # DeltaV - removed for incongruence -# id: SecurityStar -# name: loadout-group-security-star -# minLimit: 0 -# loadouts: -# - SecStar +- type: loadoutGroup + id: SecurityStar + name: loadout-group-security-star + minLimit: 0 + loadouts: + - SecStar # Medical - type: loadoutGroup diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 7f6b5a81b1f..e23906e6ccd 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -368,7 +368,7 @@ - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -383,7 +383,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -399,7 +399,7 @@ - SecurityBelt - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -414,7 +414,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout From f877a06023c4dd8d81ff023aa963b37430bba2f7 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 20 Oct 2024 02:01:37 +0200 Subject: [PATCH 08/18] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a5f8d487c7b..69a04628a15 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: VMSolidus - changes: - - message: Cargo can now order medical scrub crates - type: Add - id: 113 - time: '2023-10-29T17:38:19.0000000+00:00' - author: FluffiestFloof changes: - message: Removed the clown hardsuit from being craftable. @@ -3676,3 +3670,10 @@ id: 612 time: '2024-10-18T00:31:47.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1995 +- author: BlitzTheSquishy + changes: + - message: Readded the Sec Sticker! + type: Add + id: 613 + time: '2024-10-20T00:01:18.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2022 From 4f9ff1e96615e315d920643f427b76b4279fc392 Mon Sep 17 00:00:00 2001 From: ThataKat <49598651+ThataKat@users.noreply.github.com> Date: Sat, 19 Oct 2024 22:22:44 -0700 Subject: [PATCH 09/18] Theobromine Tweaks (vulps + coffee) (#2024) tweak theobromine and make cocoa powder metab it --- .../Prototypes/Reagents/Consumable/Food/ingredients.yml | 3 +++ Resources/Prototypes/Reagents/toxins.yml | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 34cafe50983..76362684037 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -234,6 +234,9 @@ reagent: Nutriment min: 0.1 factor: 1 + - !type:AdjustReagent # DeltaV - Make cocoa powder actually toxic to animal organs + reagent: Theobromine + amount: 0.2 plantMetabolism: - !type:PlantAdjustNutrition amount: 0.1 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 12b05f9b232..24bdf7b6596 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -403,7 +403,7 @@ boilingPoint: 554 # I'm not a chemist, but it boils at 295, lower than melting point, idk how it works so I gave it higher value metabolisms: Poison: - metabolismRate: 0.05 + metabolismRate: 0.04 # DeltaV - Slowed to allow coffee/etc to build up theobromine effects: - !type:HealthChange conditions: @@ -411,12 +411,15 @@ type: Animal # Applying damage to the mobs with lower metabolism capabilities damage: types: - Poison: 0.4 + Poison: 0.3 # DeltaV - slightly reduced to account for slowed metabolism rate - !type:ChemVomit - probability: 0.04 #Scaled for time, not metabolismrate. + probability: 0.1 #Scaled for time, not metabolismrate. # DeltaV - Increased from .04 Vomit more when there is a lot of it conditions: - !type:OrganType type: Animal + - !type:ReagentThreshold #DeltaV - Readded this. No longer causes vomitting at the lightest whiff of coffee + reagent: Theobromine + min: 0.5 - type: reagent id: Amatoxin From 3f4a7f734413a4ac386272f52e888910d9da2734 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 20 Oct 2024 07:23:03 +0200 Subject: [PATCH 10/18] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 69a04628a15..4c419390071 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Removed the clown hardsuit from being craftable. - type: Remove - id: 114 - time: '2023-10-30T13:17:07.0000000+00:00' - author: Colin-Tel changes: - message: Asterisk station has been added to the game. @@ -3677,3 +3671,10 @@ id: 613 time: '2024-10-20T00:01:18.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2022 +- author: ThataKat + changes: + - message: Small doses of theobromine no longer cause vomiting in animal species. + type: Tweak + id: 614 + time: '2024-10-20T05:22:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2024 From af41deb5f121260a40f92a6db13d39c9d80ad9df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 06:29:23 +0000 Subject: [PATCH 11/18] Update Credits (#2023) Co-authored-by: DeltaV-Bot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 5f330e6bc38..165c4e3c26b 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zumorica, ZweiHawke, Zylofan, Zymem, zzylex +0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex From 1b1169c63fb4e779a878ad0543130352b3265f9c Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 20 Oct 2024 16:02:51 +0000 Subject: [PATCH 12/18] remove 8 second role rule timer (#2026) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Shared/CCVar/CCVars.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 9b8cd896813..66c3bc6cd0e 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2120,7 +2120,7 @@ public static readonly CVarDef /// The time you must spend reading the rules, before the "Request" button is enabled /// public static readonly CVarDef GhostRoleTime = - CVarDef.Create("ghost.role_time", 8f, CVar.REPLICATED | CVar.SERVER); + CVarDef.Create("ghost.role_time", 3f, CVar.REPLICATED | CVar.SERVER); ///

/// If ghost role lotteries should be made near-instanteous. From 008e218555d0db9fed00fc1c7808b197c8e30a68 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 20 Oct 2024 18:03:10 +0200 Subject: [PATCH 13/18] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 4c419390071..436d1247939 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Asterisk station has been added to the game. - type: Add - id: 115 - time: '2023-11-01T16:32:48.0000000+00:00' - author: leonardo-dabepis changes: - message: Switched logos around @@ -3678,3 +3672,10 @@ id: 614 time: '2024-10-20T05:22:44.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2024 +- author: deltanedas + changes: + - message: Ghost role waiting time is down to 3 seconds, from 8. + type: Tweak + id: 615 + time: '2024-10-20T16:02:51.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2026 From 366e35e39acbd29fa82c3899098cd920f0671452 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 20 Oct 2024 17:30:04 +0000 Subject: [PATCH 14/18] remove salt from salvage (#2027) remove salt Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml | 4 ++-- Resources/Prototypes/Procedural/salvage_loot.yml | 2 +- Resources/Prototypes/ore.yml | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml index 661350f6de6..de70e2d5ecd 100644 --- a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml +++ b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml @@ -3,8 +3,8 @@ weights: OreIron: 1.0 OreQuartz: 1.0 - OreCoal: 0.33 - OreSalt: 0.25 + OreCoal: 0.58 # DeltaV: was 0.33, added 0.25 from salt + #OreSalt: 0.25 # DeltaV: removed salt, added weight to coal OreGold: 0.25 OreSilver: 0.25 OrePlasma: 0.20 diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 68bfcd89573..c29cc2ef158 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -139,7 +139,7 @@ guaranteed: true loots: - !type:BiomeMarkerLoot - proto: OreSalt + proto: OreCoal # DeltaV: replace salt with coal # - Medium value - type: salvageLoot diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index 5beda7a2098..3fa2507392c 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -90,7 +90,7 @@ id: RandomOreDistributionStandard weights: OreSteel: 10 - OreCoal: 10 + OreCoal: 12 # DeltaV: increased slightly from 10 so there is a surplus to give to chem OreSpaceQuartz: 8 OreGold: 2 OrePlasma: 4 @@ -98,7 +98,6 @@ OreUranium: 1 OreBananium: 0.5 OreArtifactFragment: 0.5 - OreSalt: 5 #Delta V - Adds so our rocks can spawn salt - type: weightedRandomOre id: OreCrab From 8261f82c1aab11212fed80773b11169379257dee Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 20 Oct 2024 19:30:23 +0200 Subject: [PATCH 15/18] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 436d1247939..da51e7964ed 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: leonardo-dabepis - changes: - - message: Switched logos around - type: Tweak - id: 116 - time: '2023-11-01T22:45:55.0000000+00:00' - author: TJohnson changes: - message: Security has received new models of hardsuit! @@ -3679,3 +3673,10 @@ id: 615 time: '2024-10-20T16:02:51.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2026 +- author: deltanedas + changes: + - message: Removed salt ore in favour of coal. Give the chemists carbon! + type: Remove + id: 616 + time: '2024-10-20T17:30:04.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2027 From 7da26af70e4d99c2d63682386e1f1d3c9b8a2696 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 20 Oct 2024 17:47:16 +0000 Subject: [PATCH 16/18] replace mantis bag prototypes with starting gear (#2030) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../en-US/deltav/preferences/loadout-groups.ftl | 1 - .../Fills/Backpacks/StarterGear/backpack.yml | 13 ------------- .../Fills/Backpacks/StarterGear/duffelbag.yml | 13 ------------- .../Fills/Backpacks/StarterGear/satchel.yml | 13 ------------- .../Loadouts/Jobs/Epistemics/forensicmantis.yml | 16 ---------------- .../Nyanotrasen/Loadouts/loadout_groups.yml | 8 -------- .../Nyanotrasen/Loadouts/role_loadouts.yml | 2 +- .../Roles/Jobs/Epistemics/forensicmantis.yml | 6 ++++++ 8 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index a81350ed0f0..e2833be68f9 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -67,7 +67,6 @@ loadout-group-scarfs = Scarf # Epistemics loadout-group-mantis-head = Mantis head loadout-group-mantis-jumpsuit = Mantis jumpsuit -loadout-group-mantis-backpack = Mantis backpack loadout-group-mantis-outerclothing = Mantis outer clothing loadout-group-mantis-shoes = Mantis shoes loadout-group-mantis-gloves = Mantis gloves diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml deleted file mode 100644 index 66b1854dafb..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - categories: [ HideSpawnMenu ] - parent: ClothingBackpackScience - id: ClothingBackpackMantisFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective - - id: HandLabeler - - id: PillMindbreakerToxin - - id: BoxFolderGrey - - id: RubberStampMantis diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml deleted file mode 100644 index 49ca0460aa5..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - categories: [ HideSpawnMenu ] - parent: ClothingBackpackDuffelScience - id: ClothingBackpackDuffelMantisFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective - - id: HandLabeler - - id: PillMindbreakerToxin - - id: BoxFolderGrey - - id: RubberStampMantis diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml deleted file mode 100644 index 9a33ad34685..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - categories: [ HideSpawnMenu ] - parent: ClothingBackpackSatchelScience - id: ClothingBackpackSatchelMantisFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective - - id: HandLabeler - - id: PillMindbreakerToxin - - id: BoxFolderGrey - - id: RubberStampMantis diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml index c6df3e71ca3..33224a158a2 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml @@ -15,22 +15,6 @@ equipment: jumpsuit: ClothingUniformSkirtMantis -# Back -- type: loadout - id: MantisBackpack - equipment: - back: ClothingBackpackMantisFilled - -- type: loadout - id: MantisSatchel - equipment: - back: ClothingBackpackSatchelMantisFilled - -- type: loadout - id: MantisDuffel - equipment: - back: ClothingBackpackDuffelMantisFilled - # OuterClothing - type: loadout id: MantisCoat diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml index 2ffcbd25368..740d034967f 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml @@ -37,14 +37,6 @@ - MantisJumpsuit - MantisJumpskirt -- type: loadoutGroup - id: MantisBackpack - name: loadout-group-mantis-backpack - loadouts: - - MantisBackpack - - MantisSatchel - - MantisDuffel - - type: loadoutGroup id: MantisOuterClothing name: loadout-group-mantis-outerclothing diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml index 0ef279f75cc..5a7f6576a80 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml @@ -18,7 +18,7 @@ - GroupTankHarness - MantisHead - MantisJumpsuit - - MantisBackpack + - ScientistBackpack - MantisOuterClothing - MantisShoes - MantisGloves diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index f4d511f6a87..b31b6ec1b0b 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -32,3 +32,9 @@ eyes: ClothingEyesGlassesSunglasses ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics belt: ClothingBeltMantis + storage: + back: + - HandLabeler + - PillMindbreakerToxin + - BoxFolderGrey + - RubberStampMantis From 9c00983cad0335b859a88448e5b590921e286e54 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Mon, 21 Oct 2024 04:15:58 +0000 Subject: [PATCH 17/18] give xenos speech sounds from rmc14 (#2031) * import the sounds * give xenos speech sound --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Audio/_RMC14/Voice/Xeno/alien_talk1.ogg | Bin 0 -> 14732 bytes .../Audio/_RMC14/Voice/Xeno/alien_talk2.ogg | Bin 0 -> 18514 bytes .../Audio/_RMC14/Voice/Xeno/alien_talk3.ogg | Bin 0 -> 15117 bytes .../Audio/_RMC14/Voice/Xeno/attributions.yml | 14 ++++++++++++++ .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 1 + .../_RMC14/SoundCollections/xeno_speech.yml | 6 ++++++ .../Prototypes/_RMC14/Voice/speech_sounds.yml | 8 ++++++++ 7 files changed, 29 insertions(+) create mode 100644 Resources/Audio/_RMC14/Voice/Xeno/alien_talk1.ogg create mode 100644 Resources/Audio/_RMC14/Voice/Xeno/alien_talk2.ogg create mode 100644 Resources/Audio/_RMC14/Voice/Xeno/alien_talk3.ogg create mode 100644 Resources/Audio/_RMC14/Voice/Xeno/attributions.yml create mode 100644 Resources/Prototypes/_RMC14/SoundCollections/xeno_speech.yml create mode 100644 Resources/Prototypes/_RMC14/Voice/speech_sounds.yml diff --git a/Resources/Audio/_RMC14/Voice/Xeno/alien_talk1.ogg b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a6cd1d901b6df6a50ddd98585e5f6a85550f745e GIT binary patch literal 14732 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 Cjqi>C literal 0 HcmV?d00001 diff --git a/Resources/Audio/_RMC14/Voice/Xeno/alien_talk2.ogg b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8766ef4c8876f92b6996a1f7cd2c9a51e6a3b648 GIT binary patch literal 18514 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 b$zOIQrQF}vN#OZIh+4YIoM6*f0hs?kDn?$; literal 0 HcmV?d00001 diff --git a/Resources/Audio/_RMC14/Voice/Xeno/attributions.yml b/Resources/Audio/_RMC14/Voice/Xeno/attributions.yml new file mode 100644 index 00000000000..b98d9d09eb5 --- /dev/null +++ b/Resources/Audio/_RMC14/Voice/Xeno/attributions.yml @@ -0,0 +1,14 @@ +- files: ["alien_talk1.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from cmss13" + source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk.ogg" + +- files: ["alien_talk2.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from cmss13" + source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk2.ogg" + +- files: ["alien_talk3.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from cmss13" + source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk3.ogg" diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 503089a0c24..dc2011b804b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -119,6 +119,7 @@ molsPerSecondPerUnitMass: 0.0005 - type: Speech speechVerb: LargeMob + speechSounds: Xenonid # DeltaV: Use RMC's speech sounds for sentient xenos - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. chance: -2 - type: Psionic #Nyano - Summary: makes psionic by default. diff --git a/Resources/Prototypes/_RMC14/SoundCollections/xeno_speech.yml b/Resources/Prototypes/_RMC14/SoundCollections/xeno_speech.yml new file mode 100644 index 00000000000..82e03453ce8 --- /dev/null +++ b/Resources/Prototypes/_RMC14/SoundCollections/xeno_speech.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: XenonidSpeech + files: + - /Audio/_RMC14/Voice/Xeno/alien_talk1.ogg + - /Audio/_RMC14/Voice/Xeno/alien_talk2.ogg + - /Audio/_RMC14/Voice/Xeno/alien_talk3.ogg diff --git a/Resources/Prototypes/_RMC14/Voice/speech_sounds.yml b/Resources/Prototypes/_RMC14/Voice/speech_sounds.yml new file mode 100644 index 00000000000..98c4f643e8c --- /dev/null +++ b/Resources/Prototypes/_RMC14/Voice/speech_sounds.yml @@ -0,0 +1,8 @@ +- type: speechSounds + id: Xenonid + saySound: + collection: XenonidSpeech + askSound: + collection: XenonidSpeech + exclaimSound: + collection: XenonidSpeech From 1f21b4601ac3eaf000381cea99cecb731367bc7b Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 22 Oct 2024 09:07:26 +0200 Subject: [PATCH 18/18] disable the stupid fucking rate limit popup (#2033) I DON'T CARE --- Content.Server/Chat/Managers/ChatManager.RateLimit.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Chat/Managers/ChatManager.RateLimit.cs b/Content.Server/Chat/Managers/ChatManager.RateLimit.cs index ccb38166a6d..86bd3619e5e 100644 --- a/Content.Server/Chat/Managers/ChatManager.RateLimit.cs +++ b/Content.Server/Chat/Managers/ChatManager.RateLimit.cs @@ -28,7 +28,7 @@ private void RateLimitPlayerLimited(ICommonSession player) private void RateLimitAlertAdmins(ICommonSession player) { - SendAdminAlert(Loc.GetString("chat-manager-rate-limit-admin-announcement", ("player", player.Name))); + // SendAdminAlert(Loc.GetString("chat-manager-rate-limit-admin-announcement", ("player", player.Name))); // DeltaV - I DON'T CARE } public RateLimitStatus HandleRateLimit(ICommonSession player)