From e9f0b869ee7ad1216d8400ebfbe847948d16f19c Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 24 Sep 2024 07:15:17 +0000 Subject: [PATCH 001/561] make cats attack mouse toy (#1877) * make cats attack mouse toy * make toy mouse bit work * pro * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/DeltaV/ai_factions.yml | 5 +++++ Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 6 ++++++ Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 2 ++ Resources/Prototypes/Entities/Objects/Fun/toys.yml | 11 +++++++++++ 4 files changed, 24 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/ai_factions.yml diff --git a/Resources/Prototypes/DeltaV/ai_factions.yml b/Resources/Prototypes/DeltaV/ai_factions.yml new file mode 100644 index 00000000000..783fc9d9889 --- /dev/null +++ b/Resources/Prototypes/DeltaV/ai_factions.yml @@ -0,0 +1,5 @@ +- type: npcFaction + id: Cat + hostile: + - Mouse + - SimpleHostile diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index e7d9f6f6364..8be302a5e2c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2867,6 +2867,12 @@ - type: Tag tags: - VimPilot + - type: HTN # DeltaV - make all cats eat mice + rootTask: + task: SimpleHostileCompound + - type: NpcFactionMember # DeltaV - give cats faction so they fight mice + factions: + - Cat - type: entity name: calico cat diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3fe80c75c56..7733f0a4be6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -135,6 +135,7 @@ - type: NpcFactionMember factions: - PetsNT + - Cat # DeltaV - type: HTN rootTask: task: SimpleHostileCompound @@ -158,6 +159,7 @@ - type: NpcFactionMember factions: - PetsNT + - Cat # DeltaV - type: Grammar attributes: proper: true diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 476f3e6cdfa..65ba53fcccf 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -666,6 +666,17 @@ equippedPrefix: mouse slots: - HEAD + # Begin DeltaV additions: make cats attack mouse toys to play with them + - type: Damageable + damageContainer: StructuralInorganic # not actually destructible, just lets it be attacked + - type: MobState + - type: MobThresholds + thresholds: + 0: Alive # always be considered alive + - type: NpcFactionMember + factions: + - Mouse + # End DeltaV additions - type: entity parent: BasePlushie From fc263ecced6a42ce77202affc7c1733dfc6a6cd4 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:15:36 +0200 Subject: [PATCH 002/561] 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 5a8914069df..efdaf97197c 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Removed the random sentience event. - type: Remove - id: 80 - time: '2023-10-23T19:17:23.0000000+00:00' - author: Colin-Tel changes: - message: Fixed Tortuga station's critical lack of hardsuits @@ -3629,3 +3623,10 @@ id: 579 time: '2024-09-23T18:53:31.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1903 +- author: deltanedas + changes: + - message: Cats will now play with mouse toys. + type: Tweak + id: 580 + time: '2024-09-24T07:15:18.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1877 From c4d6e1b7819dbfaa1d4995579afa81b1ae9e7782 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:30:50 +0000 Subject: [PATCH 003/561] revert mapping mode (#1907) Add mapping load acts (#30722) Smug doesn't seem to have time to fix mapping state and I don't want to dump more time into it so. Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Content.Client/Commands/MappingClientSideSetupCommand.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs index eb2d13c9540..3255e85e18f 100644 --- a/Content.Client/Commands/MappingClientSideSetupCommand.cs +++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs @@ -1,3 +1,4 @@ +using Content.Client.Actions; using Content.Client.Mapping; using Content.Client.Markers; using JetBrains.Annotations; @@ -25,7 +26,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) _entitySystemManager.GetEntitySystem().MarkersVisible = true; _lightManager.Enabled = false; shell.ExecuteCommand("showsubfloorforever"); - _stateManager.RequestStateChange(); + _entitySystemManager.GetEntitySystem().LoadActionAssignments("/mapping_actions.yml", false); } } } From 364acb1ddcf2f604566c5f283286aaf79d6074af Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 24 Sep 2024 18:33:01 +0200 Subject: [PATCH 004/561] nukie mouse yaml cleanup (#1900) * cleanup * autotraitor evil --- .../DeltaV/Entities/Mobs/NPCs/nukiemouse.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml index bde0a73504c..5036957a1d8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml @@ -44,8 +44,6 @@ - SmallMobMask layer: - SmallMobLayer - - type: MobState - - type: Deathgasp - type: MobStateActions actions: Critical: @@ -60,10 +58,6 @@ - type: MovementSpeedModifier baseWalkSpeed : 3 baseSprintSpeed : 4.9 - - type: Reactive - groups: - Flammable: [Touch] - Extinguish: [Touch] - type: InventorySlots - type: UserInterface interfaces: @@ -126,7 +120,6 @@ Female: Mouse Unsexed: Mouse wilhelmProbability: 0.01 - - type: CombatMode - type: MeleeWeapon soundHit: path: /Audio/Effects/bite.ogg @@ -153,10 +146,6 @@ - type: ActiveRadio channels: - Syndicate - # make the player a traitor once its taken - - type: AutoTraitor - giveUplink: false - giveObjectives: false - type: InteractionPopup successChance: 0.6 interactSuccessString: petting-success-nukie-mouse From 07755a88e0b65ca9d1c4cc94183e4cde984fe0f8 Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 24 Sep 2024 18:33:08 +0200 Subject: [PATCH 005/561] fix telegnomes sliding on ice (#1898) * fix * shuffle shit around * trolled * webedit ops Signed-off-by: Milon --------- Signed-off-by: Milon --- .../Entities/Mobs/Player/special.yml | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml index d057423f1ba..01ae63659b6 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml @@ -1,13 +1,11 @@ - type: entity + parent: [ Incorporeal, BaseMob ] id: MobObserverTelegnostic name: telegnostic projection description: Ominous. categories: [ HideSpawnMenu ] components: - type: Sprite - overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained. - noRot: true - drawdepth: Ghosts sprite: Objects/Consumable/Food/bowl.rsi state: eyeball color: "#90EE90" @@ -15,28 +13,12 @@ - state: eyeball shader: unshaded - type: Psionic - - type: MindContainer - - type: Clickable - - type: InteractionOutline - type: Physics - bodyType: KinematicController fixedRotation: true - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 13 - mask: - - GhostImpassable - type: MovementSpeedModifier baseSprintSpeed: 8 baseWalkSpeed: 5 - - type: MovementIgnoreGravity #- type: PsionicallyInvisible - - type: InputMover - - type: Appearance - type: Eye drawFov: false visMask: @@ -44,7 +26,6 @@ - TelegnosticProjection - type: Input context: "ghost" - - type: Examiner - type: TelegnosticProjection - type: Stealth lastVisibility: 0.66 From be388de18c4d9a97968e4a96cace6c11bcdcfe34 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:33:27 +0200 Subject: [PATCH 006/561] 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 efdaf97197c..5836c1c28cb 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Fixed Tortuga station's critical lack of hardsuits - type: Fix - id: 81 - time: '2023-10-23T21:40:33.0000000+00:00' - author: Colin-Tel changes: - message: Removed prisoners from job selection, since they were spawning in arrivals. @@ -3630,3 +3624,10 @@ id: 580 time: '2024-09-24T07:15:18.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1877 +- author: MilonPL + changes: + - message: Telegnostic projections will no longer slide on ice. + type: Fix + id: 581 + time: '2024-09-24T16:33:09.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1898 From a900943164242f955e6e5a1bec3ea39f0126b8b0 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:48:44 +0000 Subject: [PATCH 007/561] let goliaths pry doors (#1908) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml index 877dd40cc38..ecf0c002a22 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml @@ -90,6 +90,12 @@ - id: FoodMeatGoliath amount: 3 - id: MaterialGoliathHide1 + - type: Prying # DeltaV: let sentient goliaths pry doors + pryPowered: true + force: true + speedModifier: 1.5 + useSound: + path: /Audio/Items/crowbar.ogg - type: entity id: ActionGoliathTentacle From a316329896295407f1a8956c5eca416da19ce0d4 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 21:49:03 +0200 Subject: [PATCH 008/561] 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 5836c1c28cb..53086154e67 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Removed prisoners from job selection, since they were spawning in arrivals. - Warden no longer requires prisoner playtime in the meantime. - type: Remove - id: 82 - time: '2023-10-23T23:12:41.0000000+00:00' - author: VMSolidus changes: - message: Harpies can now be stripped, and can randomly be psychic @@ -3631,3 +3624,10 @@ id: 581 time: '2024-09-24T16:33:09.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1898 +- author: deltanedas + changes: + - message: Goliaths can now pry doors open. + type: Tweak + id: 582 + time: '2024-09-24T19:48:45.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1908 From bde4b9d6c20201f62167d674e68aca54f10a7480 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:25:14 +0000 Subject: [PATCH 009/561] make chapel sprite purple (#1910) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Structures/Wallmounts/Signs/signs.yml | 1 + .../Structures/Wallmounts/signs.rsi/chapel.png | Bin 0 -> 518 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 7 +++++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/chapel.png diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 26d1fcf3f80..2eda24a90be 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -421,6 +421,7 @@ description: A sign indicating the chapel. components: - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi # DeltaV: Epi-themed chapel sprite state: chapel - type: entity diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/chapel.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/chapel.png new file mode 100644 index 0000000000000000000000000000000000000000..587fa4672335b4f0dfdf2d065d28a640a659bb54 GIT binary patch literal 518 zcmV+h0{Q)kP)Px$z)3_wR9J=WSHEk*P!PV9QUoWVg9TkmhvJY;LclqTyPLR*Q2!W(&^2^(@8Vnt z!OcNBlr9Q&C^!|w#SZD&d+%M67k#0H_FEqB$KCh6yURTS@Yi8+i!H0WFN*MK{~&NG z0$NsgU%4(p>7r(we7jr0=5;HG5CkB3t>PLdN31rXAmU6uP{hsC{3`-<;m>S#%!{K1 z1j8yj7A8QxVH8fmaXkP4a9j_faGHAlWC3_X>KI8WIqvI5BzFpA$Gy=yb>FxEic<>^ zfawEQw>NNEt_z18*Hdmf?yJu3?!|d9tSYtf{;`C&=a=L@z#$5!Y-o{CCQc&fpq&Cv z#JC@m%hAv!&n18pf#fs-dB}4MkbyVn>cOZ0e`bR}vk#32K+QXyJFa)I$-;RW>7Y43 zjPY7BDFVNiZyVJQMPdYkVO1ixwVMpuqL4IOtv+B9T75vyp*-R~)`VOmN%kDr8t9GI zY`*Azr|}4rMH`}Kyhi6)_7q1y$CE`{nbSNQe~#rFadX;$bR)o~Ag Date: Wed, 25 Sep 2024 22:45:38 +1000 Subject: [PATCH 010/561] Diona.xml correction (#1906) * Diona.xml correction * Update Diona.xml Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --------- Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/ServerInfo/Guidebook/Mobs/Diona.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml index eedf23b14f2..890efb356d3 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml @@ -6,7 +6,7 @@ They can't wear shoes, but are not slowed by Kudzu. - They get hungry and thirsty slower. + They get hungry slower and thirsty faster. Their "blood" is tree sap and can't be metabolised from Iron. Being plants, Weed Killer poisons them, while Robust Harvest heals them (but not without risk when overused!) From 00fed634f32fae2715af8451eccf64ff291b7624 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Wed, 25 Sep 2024 20:06:47 -0300 Subject: [PATCH 011/561] Fix typo at the end of round steal objectives locale (#1912) Fixed the typo. --- .../Locale/en-US/objectives/conditions/steal-target-groups.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index 12c562422d9..ba0545fb59e 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -52,7 +52,7 @@ steal-target-groups-chem-dispenser = chemical dispenser steal-target-groups-xeno-artifact = alien artifact steal-target-groups-booze-dispenser = booze dispenser # DeltaV - Epistemics Department - Replace RD with Mystagogue -steal-target-groups-plant-rd = "Mytagogue's potted plant" +steal-target-groups-plant-rd = "Mystagogue's potted plant" steal-target-groups-toilet-golden-dirty-water = golden toilet # Thief Animal From 7cb981861fac4a01854ab68c67738d5254e8cf01 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Wed, 25 Sep 2024 20:53:44 -0500 Subject: [PATCH 012/561] Map Edits: The Hive (#1913) Co-authored-by: Velcroboy --- Resources/Maps/hive.yml | 2077 ++++++++++++++++++++------------------- 1 file changed, 1073 insertions(+), 1004 deletions(-) diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 910be260221..3b87acf9188 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -223,11 +223,11 @@ entities: version: 6 0,-4: ind: 0,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZQAAAAADQQAAAAAAZQAAAAADZQAAAAAAZQAAAAABZQAAAAADZQAAAAADZQAAAAABQQAAAAAAZQAAAAACZQAAAAACZQAAAAACZQAAAAACZQAAAAABZQAAAAACZQAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAAAZQAAAAABZQAAAAABZQAAAAACZQAAAAABZQAAAAACZQAAAAADZQAAAAAAZQAAAAACZQAAAAACZQAAAAAAZQAAAAAAZQAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZQAAAAADZQAAAAAAZQAAAAADZQAAAAAAQQAAAAAAZQAAAAADZQAAAAADZQAAAAABZQAAAAAAZQAAAAACZQAAAAACZQAAAAACZQAAAAACZQAAAAABZQAAAAACZQAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAAAZQAAAAABZQAAAAABZQAAAAACZQAAAAABZQAAAAACZQAAAAADZQAAAAAAZQAAAAACZQAAAAACZQAAAAAAZQAAAAAAZQAAAAAD version: 6 -1,-4: ind: -1,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAAAZQAAAAADZQAAAAABZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAADZQAAAAAAZQAAAAACZQAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAAAQQAAAAAAZQAAAAABZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAADZQAAAAAAZQAAAAACZQAAAAAB version: 6 -1,-3: ind: -1,-3 @@ -762,12 +762,6 @@ entities: decals: 88: -10,45 89: -8,45 - - node: - color: '#FFFFFFFF' - id: BrickLineOverlayS - decals: - 5488: 87,-9 - 5489: 88,-9 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe @@ -863,10 +857,10 @@ entities: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 450: 8,-26 478: 7,-27 479: 7,-26 480: 7,-25 + 6232: 8,-26 - node: color: '#52B4E996' id: BrickTileWhiteBox @@ -2601,8 +2595,8 @@ entities: 5486: 86,-10 5487: 89,-10 5494: 87,-8 - 5495: 88,-8 5502: 87,-7 + 6244: 88,-8 - node: color: '#6B2833DD' id: BrickTileWhiteLineN @@ -2943,7 +2937,7 @@ entities: id: BrickTileWhiteLineN decals: 5490: 87,-8 - 5491: 88,-8 + 6239: 88,-8 - node: color: '#334E6DC8' id: BrickTileWhiteLineS @@ -3004,11 +2998,11 @@ entities: 736: 0,-50 737: 2,-50 738: 3,-50 - 739: 4,-50 740: 5,-50 - 741: 6,-50 - 742: 7,-50 - 743: 9,-50 + 6254: 1,-50 + 6255: -1,-50 + 6256: -2,-50 + 6257: -4,-50 - node: color: '#52B4E996' id: BrickTileWhiteLineS @@ -3062,10 +3056,10 @@ entities: 5475: 66,-5 5484: 86,-7 5485: 89,-7 - 5498: 87,-9 - 5499: 88,-9 5500: 87,-10 5501: 88,-10 + 6242: 87,-9 + 6243: 88,-9 - node: color: '#6B2833DD' id: BrickTileWhiteLineS @@ -3346,6 +3340,12 @@ entities: 5441: 72,-16 5442: 71,-16 5443: 70,-16 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineS + decals: + 6240: 87,-9 + 6241: 88,-9 - node: color: '#334E6DC8' id: BrickTileWhiteLineW @@ -4167,6 +4167,12 @@ entities: 4902: -88,4 5230: -46,-41 5233: -47,-43 + - node: + color: '#A4610696' + id: DeliveryGreyscale + decals: + 6247: -37,-39 + 6248: -35,-43 - node: color: '#DE3A3A96' id: DeliveryGreyscale @@ -4210,6 +4216,8 @@ entities: 5237: 63,-21 5238: 63,-22 5239: 63,-23 + 6245: -37,-39 + 6246: -35,-43 - node: color: '#169C9CFF' id: DiagonalCheckerAOverlay @@ -5454,8 +5462,6 @@ entities: color: '#FFFFFFFF' id: DirtHeavy decals: - 1849: 8.025802,-52.01098 - 1850: 8.025802,-52.01098 1873: 1.9995551,-37.991898 1874: 3.9683056,-38.0336 1875: 3.9683056,-38.0336 @@ -5601,12 +5607,6 @@ entities: 1795: 1.5304413,-50.037285 1796: 1.4625741,-49.516083 1797: 1.4625741,-49.516083 - 1798: 7.519104,-50.600174 - 1799: 7.56077,-50.495934 - 1800: 7.56077,-50.339577 - 1801: 8.477437,-50.391693 - 1802: 8.456603,-50.235336 - 1803: 8.43577,-50.07898 1804: 8.050354,-49.57863 1805: 7.99827,-49.47439 1806: 7.894104,-49.49524 @@ -5652,11 +5652,6 @@ entities: 1846: 25.367579,-53.330887 1847: 25.346746,-53.16411 1848: 26.782354,-51.990128 - 1851: 0.56068707,-51.619858 - 1852: 1.435687,-51.60943 - 1853: 1.498187,-52.047234 - 1854: 1.3627704,-52.40165 - 1855: 0.8523537,-52.370377 1856: 4.981906,-45.67549 1857: 4.9923224,-45.477432 1858: 10.532811,-46.511147 @@ -8210,11 +8205,6 @@ entities: 5666: 41,15 5667: 42,15 5668: 43,15 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelLineE - decals: - 637: 8,-26 - node: color: '#9FED5896' id: Omni @@ -8463,6 +8453,7 @@ entities: decals: 149: 0,43 5157: -8,-6 + 6253: -35,-39 - node: color: '#FFFFFFFF' id: WarnEndE @@ -8602,6 +8593,7 @@ entities: 6190: 136,2 6191: 137,2 6192: 138,2 + 6252: -36,-39 - node: color: '#FFFFFFFF' id: WarnLineS @@ -8639,6 +8631,9 @@ entities: 5224: -46,-46 5231: -46,-42 5232: -46,-43 + 6249: -35,-42 + 6250: -35,-41 + 6251: -35,-40 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -9018,7 +9013,7 @@ entities: 0: 65039 0,4: 0: 33279 - 1: 12288 + 2: 12288 0,-1: 0: 61166 1,0: @@ -9066,13 +9061,15 @@ entities: 4,3: 0: 52639 0,-4: - 0: 64764 + 0: 60668 0,-5: 0: 65359 + -1,-4: + 0: 54597 0,-3: - 0: 65167 + 0: 65166 -1,-3: - 0: 56645 + 0: 56653 0,-2: 0: 61006 -1,-2: @@ -9115,17 +9112,17 @@ entities: 0: 39743 -8,-9: 0: 65280 - 2: 4 + 1: 4 -9,-8: 0: 65416 -8,-7: 0: 4369 - 2: 52428 + 1: 52428 -9,-7: 0: 48056 -8,-6: 0: 4593 - 2: 49152 + 1: 49152 -9,-6: 0: 63931 -8,-5: @@ -9137,13 +9134,13 @@ entities: -7,-8: 0: 21839 -7,-7: - 2: 65521 + 1: 65521 0: 4 -7,-6: - 2: 65535 + 1: 65535 -7,-5: 0: 61681 - 2: 14 + 1: 14 -7,-9: 0: 65535 -7,-4: @@ -9151,49 +9148,49 @@ entities: -6,-8: 0: 65535 -6,-7: - 2: 65520 + 1: 65520 -6,-6: - 2: 16383 + 1: 16383 -6,-5: - 2: 1 + 1: 1 0: 47290 -6,-9: 0: 65297 - 2: 4 + 1: 4 -6,-4: 0: 65225 -5,-8: 0: 13119 - 2: 34816 + 1: 34816 -5,-7: - 2: 30712 + 1: 30712 -5,-6: - 2: 7 + 1: 7 0: 60928 -5,-5: 0: 4479 - 1: 49152 + 2: 49152 -5,-9: 0: 65416 -5,-4: 0: 4881 - 1: 52428 + 2: 52428 -4,-8: 0: 15 - 2: 65280 + 1: 65280 -4,-6: 0: 65294 -4,-5: 0: 34947 - 1: 13056 + 2: 13056 -4,-4: - 1: 4403 + 2: 4403 0: 49288 -4,-3: - 1: 1 + 2: 1 0: 32524 -5,-3: - 1: 12 + 2: 12 0: 64272 -4,-2: 0: 63255 @@ -9206,9 +9203,9 @@ entities: -4,0: 0: 65287 -3,-4: - 0: 63709 + 0: 55517 -3,-3: - 0: 65485 + 0: 65487 -3,-2: 0: 65535 -3,-1: @@ -9229,10 +9226,8 @@ entities: 0: 65407 -2,-5: 0: 49660 - -1,-4: - 0: 21830 -1,-5: - 0: 25719 + 0: 21623 4,4: 0: 47357 5,0: @@ -9317,7 +9312,7 @@ entities: 0: 63351 -8,-1: 0: 21572 - 2: 17 + 1: 17 -9,0: 0: 65501 -8,1: @@ -9326,15 +9321,15 @@ entities: 0: 56831 -8,2: 0: 17477 - 2: 4352 + 1: 4352 -9,2: 0: 284 - 2: 52224 + 1: 52224 -8,3: - 2: 23 + 1: 23 0: 31744 -9,3: - 2: 255 + 1: 255 0: 53504 -8,4: 0: 57460 @@ -9379,19 +9374,19 @@ entities: -4,3: 0: 65287 -9,-4: - 2: 65248 + 1: 65248 -8,-3: 0: 17873 - 2: 4096 + 1: 4096 -9,-3: - 2: 65535 + 1: 65535 -8,-2: - 2: 30583 + 1: 30583 -9,-2: - 2: 52462 + 1: 52462 0: 785 -9,-1: - 2: 204 + 1: 204 0: 49425 -7,-3: 0: 30591 @@ -9421,10 +9416,10 @@ entities: 0: 61160 -1,4: 0: 4607 - 1: 49152 + 2: 49152 -9,4: 0: 196 - 2: 61713 + 1: 61713 -8,5: 0: 65534 -8,6: @@ -9437,62 +9432,61 @@ entities: 0: 56558 -8,8: 0: 141 - 2: 57856 + 1: 57856 -7,5: 0: 511 - 2: 49152 + 1: 49152 -7,7: 0: 12289 - 2: 35054 + 1: 35054 -7,6: - 2: 61166 + 1: 61166 -7,8: 0: 55 - 2: 63624 + 1: 63624 -6,5: 0: 3827 -6,6: - 2: 30481 + 1: 30481 0: 102 -6,7: - 2: 65527 + 1: 65527 -6,8: - 2: 65535 + 1: 65535 -5,5: 0: 15344 -5,6: 0: 49151 -5,7: - 2: 65328 + 1: 65328 0: 8 -5,8: - 2: 8191 + 1: 8191 -4,5: 0: 52700 -4,6: 0: 65311 -4,7: 0: 79 - 2: 28928 + 1: 28928 0,5: - 1: 51 + 2: 51 0: 63628 -1,5: - 1: 204 + 2: 204 0: 61457 0,6: 0: 62702 -1,6: - 0: 62345 - 3: 2 + 0: 62347 0,7: 0: 3087 - 2: 13056 + 1: 13056 -1,7: 0: 13103 - 2: 34816 + 1: 34816 0,8: - 2: 4095 + 1: 4095 1,5: 0: 61183 1,6: @@ -9500,7 +9494,7 @@ entities: 1,7: 0: 53007 1,8: - 2: 273 + 1: 273 0: 3276 2,5: 0: 56575 @@ -9530,21 +9524,21 @@ entities: 0: 58976 -3,-8: 0: 3299 - 2: 4096 + 1: 4096 -3,-7: - 2: 52479 + 1: 52479 0: 4096 -3,-6: 0: 65281 - 2: 12 + 1: 12 -3,-9: 0: 40160 -2,-8: 0: 20465 -2,-7: - 2: 65393 + 1: 65393 -2,-6: - 2: 15 + 1: 15 0: 65280 -2,-9: 0: 56784 @@ -9552,18 +9546,18 @@ entities: 0: 49136 -1,-7: 0: 3 - 2: 65408 + 1: 65408 -1,-6: - 2: 15 + 1: 15 0: 65280 -1,-9: 0: 48058 0,-8: 0: 4080 0,-7: - 2: 16382 + 1: 16382 0,-6: - 2: 3 + 1: 3 0: 65292 0,-9: 0: 61199 @@ -9598,7 +9592,7 @@ entities: 4,-6: 0: 65295 -4,8: - 2: 4095 + 1: 4095 -3,5: 0: 54551 -3,6: @@ -9606,7 +9600,7 @@ entities: -3,7: 0: 33727 -3,8: - 2: 4095 + 1: 4095 -2,5: 0: 55807 -2,6: @@ -9614,10 +9608,10 @@ entities: -2,7: 0: 28783 -2,8: - 2: 247 + 1: 247 0: 10240 -1,8: - 2: 248 + 1: 248 0: 16640 -12,0: 0: 32767 @@ -9639,7 +9633,7 @@ entities: 0: 15291 -12,4: 0: 7 - 2: 61064 + 1: 61064 -11,0: 0: 65535 -11,1: @@ -9651,7 +9645,7 @@ entities: -11,-1: 0: 64796 -11,4: - 2: 65535 + 1: 65535 -10,0: 0: 61438 -10,1: @@ -9661,30 +9655,30 @@ entities: -10,3: 0: 35591 -10,4: - 2: 65535 + 1: 65535 -10,-1: 0: 36591 4,8: 0: 819 - 2: 2184 + 1: 2184 5,5: 0: 49617 5,6: 0: 64433 5,7: 0: 783 - 2: 52224 + 1: 52224 5,8: - 2: 4095 + 1: 4095 6,5: 0: 48120 6,6: 0: 16305 6,7: 0: 79 - 2: 28928 + 1: 28928 6,8: - 2: 255 + 1: 255 0: 10240 7,5: 0: 47931 @@ -9692,9 +9686,9 @@ entities: 0: 33720 7,7: 0: 959 - 2: 32768 + 1: 32768 7,8: - 2: 255 + 1: 255 0: 16640 8,4: 0: 65485 @@ -9704,9 +9698,9 @@ entities: 0: 63803 8,7: 0: 15 - 2: 65024 + 1: 65024 8,8: - 2: 255 + 1: 255 0: 3840 9,4: 0: 65535 @@ -9719,7 +9713,7 @@ entities: 9,3: 0: 65359 9,8: - 2: 30719 + 1: 30719 10,4: 0: 65535 10,5: @@ -9728,20 +9722,20 @@ entities: 0: 65520 10,7: 0: 271 - 2: 60928 + 1: 60928 10,3: 0: 65294 10,8: - 2: 51 + 1: 51 0: 63616 11,4: 0: 53213 11,6: 0: 4371 - 2: 52360 + 1: 52360 11,7: 0: 1 - 2: 4044 + 1: 4044 11,3: 0: 53709 11,5: @@ -9752,9 +9746,9 @@ entities: 0: 30583 12,5: 0: 7 - 2: 15872 + 1: 15872 12,6: - 2: 3 + 1: 3 0: 61320 12,7: 0: 18190 @@ -9763,20 +9757,20 @@ entities: 12,8: 0: 65535 13,4: - 2: 29491 + 1: 29491 0: 136 13,5: - 2: 1911 + 1: 1911 13,6: 0: 48059 13,7: 0: 65419 13,3: - 2: 13107 + 1: 13107 0: 32844 13,8: 0: 13107 - 2: 34944 + 1: 34944 14,4: 0: 48059 14,5: @@ -9785,7 +9779,7 @@ entities: 0: 65535 14,7: 0: 287 - 2: 1024 + 1: 1024 14,3: 0: 16360 15,4: @@ -9796,7 +9790,7 @@ entities: 0: 48059 15,7: 0: 139 - 2: 512 + 1: 512 15,3: 0: 7163 16,4: @@ -9845,20 +9839,20 @@ entities: 0: 55807 13,2: 0: 49629 - 2: 12288 + 1: 12288 13,-1: 0: 56592 - 2: 15 + 1: 15 14,0: 0: 65435 14,1: 0: 47359 14,2: 0: 35003 - 2: 12288 + 1: 12288 14,-1: 0: 48012 - 2: 1 + 1: 1 15,0: 0: 65485 15,1: @@ -9901,24 +9895,24 @@ entities: 0: 65535 11,-5: 0: 61440 - 2: 238 + 1: 238 12,-4: 0: 4096 - 2: 35942 + 1: 35942 12,-3: 0: 28531 12,-2: 0: 26215 12,-5: - 2: 26227 + 1: 26227 0: 12 13,-4: 0: 15 - 2: 30464 + 1: 30464 13,-3: - 2: 26215 + 1: 26215 13,-2: - 2: 65399 + 1: 65399 13,-5: 0: 15245 14,-4: @@ -9952,33 +9946,33 @@ entities: 7,-8: 0: 49136 8,-7: - 2: 65534 + 1: 65534 7,-7: - 2: 65408 + 1: 65408 0: 3 8,-6: - 2: 15 + 1: 15 0: 65280 7,-6: - 2: 15 + 1: 15 0: 65280 9,-8: 0: 1775 9,-7: - 2: 8191 + 1: 8191 9,-6: - 2: 1 + 1: 1 0: 65422 9,-9: 0: 64733 10,-8: 0: 61439 10,-7: - 2: 18224 + 1: 18224 0: 8 10,-6: 0: 61699 - 2: 204 + 1: 204 10,-9: 0: 4369 11,-8: @@ -9986,7 +9980,7 @@ entities: 11,-7: 0: 61247 11,-6: - 2: 58992 + 1: 58992 0: 128 12,-8: 0: 65535 @@ -9994,25 +9988,24 @@ entities: 0: 65295 12,-6: 0: 51258 - 2: 12288 + 1: 12288 4,-9: 0: 48027 5,-8: 0: 4080 5,-7: - 2: 53247 + 1: 53247 5,-6: 0: 65283 - 2: 12 + 1: 12 5,-9: - 0: 47929 - 3: 2 + 0: 47931 6,-8: 0: 20466 6,-7: - 2: 65393 + 1: 65393 6,-6: - 2: 15 + 1: 15 0: 65280 6,-9: 0: 30471 @@ -10043,64 +10036,64 @@ entities: 18,4: 0: 14327 19,0: - 2: 15 + 1: 15 0: 65280 19,1: 0: 12543 - 2: 32768 + 1: 32768 19,2: 0: 65283 - 2: 8 + 1: 8 19,3: 0: 30479 19,-1: - 2: 61440 + 1: 61440 0: 191 19,4: 0: 1919 20,0: - 2: 15 + 1: 15 0: 65280 20,1: 0: 255 - 2: 61440 + 1: 61440 20,2: - 2: 1 + 1: 1 0: 56576 20,3: 0: 65309 20,-1: - 2: 61440 + 1: 61440 0: 187 20,4: 0: 64511 21,0: - 2: 15 + 1: 15 0: 65280 21,1: 0: 255 - 2: 61440 + 1: 61440 21,2: 0: 4352 - 2: 34952 + 1: 34952 21,3: 0: 54721 21,-1: - 2: 63488 + 1: 63488 0: 55 21,4: 0: 56541 22,0: - 2: 3 + 1: 3 0: 65416 22,1: 0: 51455 - 2: 4096 + 1: 4096 22,2: - 2: 12561 + 1: 12561 0: 32972 22,-1: - 2: 13107 + 1: 13107 0: 34952 22,3: 0: 43688 @@ -10171,8 +10164,8 @@ entities: 0,-12: 0: 45311 0,-13: - 0: 65282 - 2: 8 + 0: 65280 + 1: 7 -1,-12: 0: 57583 0,-11: @@ -10190,8 +10183,8 @@ entities: 1,-10: 0: 56575 1,-13: - 0: 65280 - 2: 7 + 0: 65281 + 1: 12 2,-12: 0: 55551 2,-11: @@ -10199,8 +10192,8 @@ entities: 2,-10: 0: 8191 2,-13: - 0: 65281 - 2: 12 + 0: 65280 + 1: 15 3,-12: 0: 45567 3,-11: @@ -10209,7 +10202,7 @@ entities: 0: 36863 3,-13: 0: 65280 - 2: 15 + 1: 15 4,-12: 0: 63743 4,-11: @@ -10220,7 +10213,7 @@ entities: 0: 47359 8,-13: 0: 28672 - 2: 200 + 1: 200 7,-12: 0: 53631 8,-11: @@ -10239,15 +10232,15 @@ entities: 0: 56829 10,-12: 0: 4352 - 2: 35023 + 1: 35023 10,-11: 0: 12561 - 2: 35016 + 1: 35016 10,-10: 0: 13107 - 2: 34952 + 1: 34952 10,-13: - 2: 43694 + 1: 43694 4,12: 0: 3838 5,9: @@ -10346,7 +10339,7 @@ entities: 0: 61951 13,-7: 0: 13070 - 2: 2048 + 1: 2048 13,-6: 0: 56559 13,-8: @@ -10355,7 +10348,7 @@ entities: 0: 65523 14,-7: 0: 34831 - 2: 768 + 1: 768 14,-6: 0: 47935 14,-9: @@ -10376,7 +10369,7 @@ entities: 0: 4380 16,-9: 0: 4352 - 2: 19456 + 1: 19456 17,-8: 0: 4401 17,-7: @@ -10398,26 +10391,26 @@ entities: 20,-5: 0: 4092 8,-14: - 2: 36608 + 1: 36608 7,-14: - 2: 3584 + 1: 3584 9,-14: - 2: 3840 + 1: 3840 9,-13: - 2: 272 + 1: 272 10,-14: - 2: 28416 + 1: 28416 11,-14: - 2: 4352 + 1: 4352 11,-13: - 2: 17 + 1: 17 4,-14: 0: 43520 4,-13: 0: 65450 5,-13: 0: 65280 - 2: 14 + 1: 14 5,-12: 0: 64767 6,-13: @@ -10428,29 +10421,30 @@ entities: 0: 65535 7,-13: 0: 30464 - 2: 8 - 0,-14: - 0: 8192 + 1: 8 -1,-13: - 0: 65280 - 2,-14: + 1: 8 + 0: 65282 + 1,-14: 0: 4096 -4,-14: - 2: 61440 + 1: 61440 -5,-14: - 2: 61440 + 1: 61440 -3,-14: - 2: 28672 + 1: 28672 -3,-13: - 2: 498 + 1: 498 0: 49152 -3,-12: 0: 14206 -2,-13: - 2: 18 + 1: 18 0: 56320 -2,-12: 0: 65295 + -1,-14: + 0: 8192 -4,-12: 0: 48112 -4,-11: @@ -10471,26 +10465,26 @@ entities: 0: 63351 -9,-9: 0: 32768 - 2: 17 + 1: 17 -8,-10: - 2: 17484 + 1: 17484 -8,-12: - 2: 34952 + 1: 34952 -8,-13: - 2: 34956 + 1: 34956 -8,-11: - 2: 34952 + 1: 34952 -7,-10: 0: 65280 -6,-10: 0: 4352 - 2: 17478 + 1: 17478 -6,-12: - 2: 8738 + 1: 8738 -6,-13: - 2: 8743 + 1: 8743 -6,-11: - 2: 8738 + 1: 8738 5,-11: 0: 52511 5,-10: @@ -10521,7 +10515,7 @@ entities: 0: 7631 23,-2: 0: 49425 - 2: 68 + 1: 68 24,-4: 0: 61438 24,-3: @@ -10575,37 +10569,37 @@ entities: 21,-6: 0: 47359 21,-8: - 2: 3822 + 1: 3822 0: 24576 21,-7: 0: 36590 22,-8: - 2: 49971 + 1: 49971 22,-7: 0: 273 - 2: 49152 + 1: 49152 22,-6: - 2: 3720 + 1: 3720 22,-9: - 2: 8738 + 1: 8738 23,-8: - 2: 61440 + 1: 61440 23,-7: - 2: 29218 + 1: 29218 23,-6: - 2: 256 + 1: 256 0: 3264 23,-5: 0: 3822 24,-8: - 2: 61440 + 1: 61440 24,-5: 0: 33655 8,12: 0: 6015 9,9: 0: 65280 - 2: 6 + 1: 6 9,10: 0: 48015 9,11: @@ -10616,12 +10610,12 @@ entities: 0: 4095 10,10: 0: 12288 - 2: 34 + 1: 34 10,11: 0: 13107 10,12: 0: 273 - 2: 16384 + 1: 16384 11,9: 0: 34944 11,10: @@ -10640,15 +10634,15 @@ entities: 0: 8 9,13: 0: 819 - 2: 32768 + 1: 32768 9,14: - 2: 12 + 1: 12 10,13: - 2: 61998 + 1: 61998 11,13: - 2: 64719 + 1: 64719 12,13: - 2: 61455 + 1: 61455 -4,9: 0: 52701 -5,9: @@ -10685,27 +10679,27 @@ entities: 0: 30576 -9,9: 0: 35071 - 2: 12288 + 1: 12288 -8,10: 0: 207 -9,10: 0: 8 - 2: 48 + 1: 48 -8,11: - 2: 28672 + 1: 28672 -9,11: - 2: 61696 + 1: 61696 -8,12: - 2: 35946 + 1: 35946 -7,9: - 2: 255 + 1: 255 0: 33536 -7,10: 0: 14591 -7,11: 0: 61439 -6,9: - 2: 119 + 1: 119 0: 28672 -6,10: 0: 14335 @@ -10716,13 +10710,13 @@ entities: -5,12: 0: 52364 -7,12: - 2: 12560 + 1: 12560 -7,13: - 2: 2246 + 1: 2246 -6,13: - 2: 3840 + 1: 3840 -5,13: - 2: 25360 + 1: 25360 0: 140 -4,13: 0: 4095 @@ -10771,33 +10765,33 @@ entities: 13,10: 0: 119 14,8: - 2: 16 + 1: 16 0: 57344 14,9: 0: 65534 14,10: 0: 61183 14,11: - 2: 32768 + 1: 32768 14,12: - 2: 4972 + 1: 4972 15,11: - 2: 8030 + 1: 8030 15,10: - 2: 32768 + 1: 32768 16,10: - 2: 5100 + 1: 5100 16,11: - 2: 3968 + 1: 3968 -12,-4: 0: 255 - 2: 57344 + 1: 57344 -12,-5: 0: 65520 -13,-4: 0: 62327 -12,-3: - 2: 35054 + 1: 35054 0: 28672 -13,-3: 0: 63487 @@ -10809,18 +10803,18 @@ entities: 0: 48051 -11,-4: 0: 255 - 2: 61440 + 1: 61440 -11,-3: - 2: 65535 + 1: 65535 -11,-2: 0: 65520 -11,-5: 0: 65520 -10,-4: - 2: 61440 + 1: 61440 0: 238 -10,-3: - 2: 65535 + 1: 65535 -10,-2: 0: 30576 -10,-5: @@ -10828,7 +10822,7 @@ entities: -16,-4: 0: 61030 -17,-4: - 2: 2296 + 1: 2296 -16,-3: 0: 61166 -16,-2: @@ -10868,30 +10862,30 @@ entities: -13,-5: 0: 63346 -20,-4: - 2: 4096 + 1: 4096 -20,-3: - 2: 61299 + 1: 61299 -21,-4: - 2: 61440 + 1: 61440 -21,-3: - 2: 4528 + 1: 4528 -20,-1: 0: 65329 - 2: 8 + 1: 8 -21,-1: 0: 31 - 2: 4576 + 1: 4576 -20,0: 0: 43955 - 2: 4096 + 1: 4096 -20,-2: - 2: 34956 + 1: 34956 -19,-3: - 2: 4096 + 1: 4096 -19,-2: - 2: 4369 + 1: 4369 -19,-1: - 2: 1 + 1: 1 0: 48896 -19,0: 0: 65522 @@ -10900,45 +10894,45 @@ entities: -18,0: 0: 64434 -18,-4: - 2: 17604 + 1: 17604 -18,-5: - 2: 17476 + 1: 17476 -18,-3: - 2: 12 + 1: 12 -17,-3: - 2: 1 + 1: 1 -17,0: 0: 64441 -21,0: 0: 9 - 2: 37142 + 1: 37142 -20,1: - 2: 16 + 1: 16 0: 15274 -21,1: - 2: 4496 + 1: 4496 0: 9 -20,2: 0: 15291 -21,2: 0: 4105 - 2: 57622 + 1: 57622 -20,3: 0: 1 - 2: 34952 + 1: 34952 -21,3: 0: 255 - 2: 4864 + 1: 4864 -19,1: 0: 4095 -19,2: 0: 187 -19,3: - 2: 4369 + 1: 4369 -20,4: - 2: 32748 + 1: 32748 -19,4: - 2: 17 + 1: 17 -18,1: 0: 3007 -18,2: @@ -10972,15 +10966,15 @@ entities: -13,4: 0: 65407 -16,-8: - 2: 39 + 1: 39 0: 34816 -17,-8: - 2: 15 + 1: 15 -16,-7: - 2: 4384 + 1: 4384 0: 51336 -16,-6: - 2: 4369 + 1: 4369 0: 52236 -15,-8: 0: 65520 @@ -11001,7 +10995,7 @@ entities: -13,-6: 0: 32631 -13,-9: - 2: 51200 + 1: 51200 0: 8 -12,-8: 0: 64988 @@ -11010,7 +11004,7 @@ entities: -12,-6: 0: 65295 -12,-9: - 2: 4352 + 1: 4352 0: 52431 -11,-8: 0: 65523 @@ -11029,79 +11023,79 @@ entities: -10,-9: 0: 30579 -16,6: - 2: 15 + 1: 15 0: 32768 -17,6: - 2: 15 + 1: 15 -16,7: 0: 52367 - 2: 4352 + 1: 4352 -17,7: 0: 26120 - 2: 7 + 1: 7 -16,8: - 2: 17153 + 1: 17153 0: 140 -15,6: - 2: 17 + 1: 17 0: 64716 -15,7: 0: 65535 -15,5: - 2: 4096 - 4: 2048 + 1: 4096 + 3: 2048 -15,8: 0: 65535 -14,5: - 4: 1792 + 3: 1792 0: 8 -14,6: 0: 65535 -14,7: 0: 4383 - 5: 17408 + 4: 17408 -14,8: 0: 65297 - 5: 4 + 4: 4 -13,5: 0: 65311 -13,6: 0: 65535 -13,7: 0: 15 - 6: 4352 - 4: 17408 + 5: 4352 + 3: 17408 -13,8: - 6: 1 - 4: 4 + 5: 1 + 3: 4 0: 65280 -12,5: 0: 65280 - 2: 14 + 1: 14 -12,6: 0: 65535 -12,7: 0: 15 - 7: 4352 - 4: 17408 + 6: 4352 + 3: 17408 -12,8: - 7: 1 - 4: 4 + 6: 1 + 3: 4 0: 65280 -11,5: - 2: 3 + 1: 3 0: 65292 -11,6: 0: 65535 -11,7: 0: 52431 - 4: 4352 + 3: 4352 -11,8: - 4: 1 + 3: 1 0: 65484 -10,5: 0: 65283 - 2: 12 + 1: 12 -10,6: 0: 65535 -10,7: @@ -11109,47 +11103,47 @@ entities: -10,8: 0: 30591 -9,5: - 2: 1 + 1: 1 0: 17732 -17,8: - 2: 3840 + 1: 3840 0: 6 -16,9: - 2: 29696 + 1: 29696 -16,10: - 2: 36079 + 1: 36079 -17,9: - 2: 61440 + 1: 61440 -15,9: 0: 4095 -15,10: - 2: 4097 + 1: 4097 -15,11: - 2: 35939 + 1: 35939 -14,9: 0: 3569 -14,11: - 2: 12834 + 1: 12834 -14,10: - 2: 8743 + 1: 8743 -14,12: - 2: 8866 + 1: 8866 0: 2056 -13,9: 0: 3568 -13,10: - 2: 132 + 1: 132 0: 8 -12,9: 0: 4080 -12,10: 0: 19655 - 2: 9008 + 1: 9008 -12,11: 0: 17476 -12,12: 0: 17733 - 2: 176 + 1: 176 -11,9: 0: 4080 -11,10: @@ -11158,19 +11152,19 @@ entities: 0: 6128 -10,10: 0: 819 - 2: 34952 + 1: 34952 -10,11: - 2: 34956 + 1: 34956 -10,12: - 2: 35000 + 1: 35000 0: 771 -9,12: - 2: 1 + 1: 1 -12,-12: - 2: 48 + 1: 48 0: 52416 -13,-12: - 2: 20208 + 1: 20208 -12,-11: 0: 30576 -13,-11: @@ -11181,77 +11175,77 @@ entities: 0: 35071 -11,-12: 0: 13104 - 2: 52428 + 1: 52428 -11,-11: 0: 48051 - 2: 8 + 1: 8 -11,-10: 0: 48059 -11,-13: - 2: 52224 + 1: 52224 0: 238 -10,-12: 0: 48048 - 2: 17472 + 1: 17472 -10,-11: 0: 65467 - 2: 68 + 1: 68 -10,-10: 0: 191 - 2: 47872 + 1: 47872 -9,-12: 0: 4368 -9,-11: 0: 13105 -9,-10: 0: 51 - 2: 4352 + 1: 4352 -13,12: 0: 3855 - 2: 240 + 1: 240 -12,13: 0: 17733 - 2: 176 + 1: 176 -13,13: 0: 3855 - 2: 240 + 1: 240 -12,14: 0: 17733 - 2: 176 + 1: 176 -13,14: 0: 3855 - 2: 240 + 1: 240 -12,15: 0: 325 - 2: 17584 + 1: 17584 -13,15: 0: 3855 - 2: 240 + 1: 240 -12,16: - 2: 61444 + 1: 61444 -11,12: - 2: 240 + 1: 240 0: 3855 -11,13: - 2: 240 + 1: 240 0: 3855 -11,14: - 2: 240 + 1: 240 0: 3855 -11,15: - 2: 240 + 1: 240 0: 3855 -10,13: 0: 771 - 2: 35000 + 1: 35000 -10,14: 0: 771 - 2: 35000 + 1: 35000 -10,15: 0: 771 - 2: 35000 + 1: 35000 -10,16: - 2: 64648 + 1: 64648 -11,-14: 0: 57344 -10,-14: @@ -11268,70 +11262,70 @@ entities: 0: 12526 21,8: 0: 19 - 2: 29696 + 1: 29696 22,6: 0: 13311 22,7: 0: 3 - 2: 36352 + 1: 36352 22,5: 0: 3816 23,7: - 2: 36608 + 1: 36608 22,8: - 2: 234 + 1: 234 23,5: 0: 1646 23,6: - 2: 10 + 1: 10 24,5: 0: 4087 24,7: - 2: 36608 + 1: 36608 23,8: - 2: 248 + 1: 248 24,6: 0: 238 25,5: 0: 8184 25,6: 0: 17 - 2: 1028 + 1: 1028 25,7: - 2: 36608 + 1: 36608 24,8: - 2: 248 + 1: 248 26,5: 0: 30590 26,6: 0: 30706 26,7: 0: 7 - 2: 36608 + 1: 36608 25,8: - 2: 248 + 1: 248 27,5: 0: 1 - 2: 63232 + 1: 63232 27,6: 0: 30576 27,7: 0: 7 - 2: 36608 + 1: 36608 26,8: - 2: 248 + 1: 248 28,4: 0: 4351 - 2: 8192 + 1: 8192 28,5: - 2: 63630 + 1: 63630 28,6: - 2: 117 + 1: 117 0: 12288 28,7: - 2: 36672 + 1: 36672 27,8: - 2: 248 + 1: 248 25,-4: 0: 52243 25,-3: @@ -11350,10 +11344,10 @@ entities: 0: 3581 26,-5: 0: 63255 - 2: 8 + 1: 8 27,-4: 0: 15 - 2: 8704 + 1: 8704 27,-3: 0: 65504 27,-2: @@ -11362,7 +11356,7 @@ entities: 0: 4095 27,-5: 0: 61440 - 2: 15 + 1: 15 28,-4: 0: 34959 28,-3: @@ -11373,10 +11367,10 @@ entities: 0: 2039 28,-5: 0: 65024 - 2: 1 + 1: 1 29,-4: 0: 62225 - 2: 4 + 1: 4 29,-3: 0: 29371 29,-2: @@ -11385,15 +11379,15 @@ entities: 0: 65399 29,-5: 0: 4352 - 2: 50176 + 1: 50176 29,0: 0: 65535 30,-4: 0: 4096 - 2: 33010 + 1: 33010 30,-3: 0: 28979 - 2: 136 + 1: 136 30,-2: 0: 63255 30,-1: @@ -11401,11 +11395,11 @@ entities: 30,0: 0: 65535 30,-5: - 2: 28672 + 1: 28672 31,-4: - 2: 240 + 1: 240 31,-3: - 2: 61441 + 1: 61441 31,-2: 0: 65520 31,-1: @@ -11413,15 +11407,15 @@ entities: 31,0: 0: 65535 32,-4: - 2: 20222 + 1: 20222 32,-3: - 2: 63044 + 1: 63044 32,-2: 0: 4368 - 2: 17476 + 1: 17476 32,-1: 0: 13185 - 2: 4 + 1: 4 28,3: 0: 34952 29,1: @@ -11432,66 +11426,66 @@ entities: 0: 16382 29,4: 0: 3 - 2: 4096 + 1: 4096 30,1: 0: 65535 30,2: 0: 3839 30,3: 0: 273 - 2: 50252 + 1: 50252 31,1: 0: 61135 31,3: - 2: 61440 + 1: 61440 32,0: 0: 13107 32,1: 0: 13065 - 2: 50368 + 1: 50368 32,3: - 2: 62528 + 1: 62528 29,5: - 2: 61441 + 1: 61441 29,7: - 2: 36608 + 1: 36608 28,8: - 2: 248 + 1: 248 30,5: - 2: 61440 + 1: 61440 30,7: - 2: 36608 + 1: 36608 29,8: - 2: 248 + 1: 248 31,5: - 2: 61440 + 1: 61440 31,7: - 2: 36608 + 1: 36608 30,8: - 2: 248 + 1: 248 32,5: - 2: 63044 + 1: 63044 32,7: - 2: 1860 + 1: 1860 31,8: - 2: 248 + 1: 248 32,6: - 2: 50246 + 1: 50246 32,4: - 2: 17476 + 1: 17476 33,5: - 2: 4369 + 1: 4369 33,6: - 2: 4369 + 1: 4369 33,4: - 2: 4369 + 1: 4369 33,3: - 2: 4352 + 1: 4352 33,7: - 2: 1 + 1: 1 33,1: 0: 3 - 2: 12848 + 1: 12848 33,0: 0: 43690 33,-1: @@ -11502,447 +11496,447 @@ entities: 0: 30464 35,0: 0: 17 - 1: 65262 + 2: 65262 35,1: - 1: 15 + 2: 15 34,1: - 2: 2048 + 1: 2048 35,-1: - 1: 61424 + 2: 61424 36,0: - 1: 4369 + 2: 4369 36,1: - 1: 1 - 2: 524 + 2: 1 + 1: 524 32,-5: - 2: 17484 + 1: 17484 33,-4: - 2: 9011 + 1: 9011 33,-3: - 2: 12834 + 1: 12834 33,-5: - 2: 8739 + 1: 8739 33,-2: - 2: 2 + 1: 2 34,-2: - 2: 32768 + 1: 32768 36,-1: - 1: 4368 - 2: 192 + 2: 4368 + 1: 192 32,-7: - 2: 61440 + 1: 61440 31,-7: - 2: 61440 + 1: 61440 32,-6: - 2: 18176 + 1: 18176 31,-6: - 2: 3976 + 1: 3976 33,-7: - 2: 12288 + 1: 12288 33,-6: - 2: 8706 + 1: 8706 24,-7: - 2: 30498 + 1: 30498 24,-6: 0: 12000 25,-8: - 2: 62532 + 1: 62532 25,-7: - 2: 65252 + 1: 65252 25,-6: - 2: 3722 + 1: 3722 25,-9: - 2: 50244 + 1: 50244 26,-8: - 2: 4369 + 1: 4369 26,-7: - 2: 61713 + 1: 61713 26,-6: - 2: 36744 + 1: 36744 26,-9: - 2: 4369 + 1: 4369 27,-7: - 2: 61440 + 1: 61440 27,-6: - 2: 3976 + 1: 3976 28,-7: - 2: 61440 + 1: 61440 28,-6: - 2: 8072 + 1: 8072 29,-7: - 2: 61440 + 1: 61440 29,-6: - 2: 3976 + 1: 3976 30,-7: - 2: 61440 + 1: 61440 30,-6: - 2: 3976 + 1: 3976 -20,5: - 2: 19 + 1: 19 -21,4: - 2: 45329 + 1: 45329 -21,5: - 2: 240 + 1: 240 -19,5: - 2: 19456 + 1: 19456 -19,6: - 2: 17484 + 1: 17484 -19,7: - 2: 19660 + 1: 19660 -19,8: - 2: 19660 + 1: 19660 -18,6: - 2: 15 + 1: 15 -18,7: - 2: 36092 + 1: 36092 -18,8: - 2: 3324 + 1: 3324 -19,9: - 2: 52292 + 1: 52292 -19,10: - 2: 3148 + 1: 3148 -18,9: - 2: 61440 + 1: 61440 20,9: 0: 4099 - 2: 26112 + 1: 26112 19,9: 0: 255 - 2: 61440 + 1: 61440 20,10: - 2: 17478 + 1: 17478 20,11: - 2: 1996 + 1: 1996 19,11: - 2: 3840 + 1: 3840 21,11: - 2: 1 + 1: 1 21,10: - 2: 16034 + 1: 16034 21,9: - 2: 8738 + 1: 8738 22,10: - 2: 19 + 1: 19 22,9: - 2: 8192 + 1: 8192 16,9: - 2: 35012 + 1: 35012 17,9: - 2: 41728 + 1: 41728 0: 142 17,10: - 2: 4371 + 1: 4371 17,11: - 2: 3889 + 1: 3889 18,9: 0: 255 - 2: 61440 + 1: 61440 18,11: - 2: 3840 + 1: 3840 -14,-12: - 2: 128 + 1: 128 -14,-11: 0: 2048 -14,-10: 0: 8 -14,13: - 2: 8866 + 1: 8866 0: 2056 -14,14: - 2: 8866 + 1: 8866 0: 2056 -14,15: - 2: 8866 + 1: 8866 0: 2056 -14,16: - 2: 58914 + 1: 58914 -13,16: - 2: 61440 + 1: 61440 -12,17: - 2: 240 + 1: 240 -13,17: - 2: 240 + 1: 240 -11,16: - 2: 61440 + 1: 61440 -11,17: - 2: 240 + 1: 240 -10,17: - 2: 242 + 1: 242 17,-9: - 2: 3840 + 1: 3840 18,-9: - 2: 3840 + 1: 3840 19,-9: - 2: 3954 + 1: 3954 19,-12: - 2: 8738 + 1: 8738 19,-13: - 2: 8738 + 1: 8738 19,-11: - 2: 8738 + 1: 8738 19,-10: - 2: 8738 + 1: 8738 20,-9: - 2: 3840 + 1: 3840 32,8: - 2: 240 + 1: 240 33,8: - 2: 17 + 1: 17 13,13: - 2: 4975 + 1: 4975 13,12: - 2: 32768 + 1: 32768 -14,17: - 2: 232 + 1: 232 -8,-14: - 2: 49152 + 1: 49152 -7,-14: - 2: 61440 + 1: 61440 -7,-13: - 2: 1 + 1: 1 -6,-14: - 2: 61440 + 1: 61440 20,-12: 0: 49344 - 2: 3072 + 1: 3072 20,-11: 0: 49344 - 2: 3072 + 1: 3072 20,-10: 0: 49344 - 2: 3072 + 1: 3072 21,-12: 0: 61680 - 2: 3840 + 1: 3840 21,-11: 0: 61680 - 2: 3840 + 1: 3840 21,-10: 0: 61680 - 2: 3840 + 1: 3840 21,-9: - 2: 256 + 1: 256 22,-12: - 2: 12066 + 1: 12066 0: 32896 22,-11: - 2: 12066 + 1: 12066 0: 32896 22,-10: - 2: 12066 + 1: 12066 0: 32896 22,-13: - 2: 12066 + 1: 12066 0: 32896 23,-12: 0: 61680 - 2: 3840 + 1: 3840 23,-11: 0: 61680 - 2: 3840 + 1: 3840 23,-10: 0: 61680 - 2: 3840 + 1: 3840 24,-12: 0: 4112 - 2: 256 + 1: 256 24,-11: 0: 4112 - 2: 256 + 1: 256 24,-10: 0: 4112 - 2: 256 + 1: 256 19,-15: - 2: 62960 + 1: 62960 19,-14: - 2: 8743 + 1: 8743 20,-15: - 2: 62704 + 1: 62704 -24,0: 0: 22355 - 2: 8236 + 1: 8236 -24,-1: 0: 4415 - 2: 192 + 1: 192 -25,0: 0: 61166 - 2: 1 + 1: 1 -24,1: 0: 22353 - 2: 8238 + 1: 8238 -25,1: 0: 61166 - 2: 1 + 1: 1 -24,2: 0: 12563 - 2: 49164 + 1: 49164 -25,2: 0: 61166 - 2: 1 + 1: 1 -24,3: 0: 255 - 2: 2048 + 1: 2048 -25,3: 0: 140 -23,0: 0: 32769 - 2: 4382 + 1: 4382 -23,1: 0: 137 - 2: 4374 + 1: 4374 -23,2: 0: 24065 - 2: 41246 + 1: 41246 -23,3: 0: 255 - 2: 4864 + 1: 4864 -23,-1: - 2: 4512 + 1: 4512 0: 3679 -23,4: - 2: 12561 + 1: 12561 -22,0: 0: 12289 - 2: 286 + 1: 286 -22,1: 0: 51 - 2: 4364 + 1: 4364 -22,2: 0: 19969 - 2: 45342 + 1: 45342 -22,3: 0: 255 - 2: 2048 + 1: 2048 -22,-1: - 2: 4528 + 1: 4528 0: 3663 -24,-4: - 2: 61440 + 1: 61440 -25,-4: - 2: 49152 + 1: 49152 -24,-2: 0: 61440 - 2: 2048 + 1: 2048 -25,-2: 0: 32768 - 2: 1 + 1: 1 -25,-1: 0: 61164 -23,-4: - 2: 61440 + 1: 61440 -24,-3: - 2: 128 + 1: 128 -23,-3: - 2: 4400 + 1: 4400 -23,-2: - 2: 785 + 1: 785 0: 61440 -22,-4: - 2: 61440 + 1: 61440 -22,-2: 0: 61440 - 2: 2048 + 1: 2048 -22,-3: - 2: 128 + 1: 128 -21,-2: - 2: 785 + 1: 785 0: 61440 -26,-3: - 2: 51200 + 1: 51200 -26,-2: - 2: 17476 + 1: 17476 -26,-1: - 2: 17476 + 1: 17476 -26,0: - 2: 17476 + 1: 17476 -25,-3: - 2: 14326 + 1: 14326 -26,1: - 2: 17476 + 1: 17476 -26,2: - 2: 17476 + 1: 17476 -26,3: - 2: 17476 + 1: 17476 -26,4: - 2: 2244 + 1: 2244 -24,5: - 2: 240 + 1: 240 -25,5: - 2: 198 + 1: 198 -24,4: - 2: 32768 + 1: 32768 -23,5: - 2: 240 + 1: 240 -22,5: - 2: 240 + 1: 240 -22,4: - 2: 32768 + 1: 32768 -25,4: - 2: 63281 + 1: 63281 20,-13: 0: 49344 - 2: 3072 + 1: 3072 21,-15: - 2: 62704 + 1: 62704 21,-13: 0: 61680 - 2: 3840 + 1: 3840 22,-15: - 2: 62704 + 1: 62704 22,-14: - 2: 8192 + 1: 8192 23,-15: - 2: 62704 + 1: 62704 23,-13: 0: 61680 - 2: 3840 + 1: 3840 24,-15: - 2: 62704 + 1: 62704 24,-13: 0: 4112 - 2: 256 + 1: 256 25,-12: - 2: 50244 + 1: 50244 25,-13: - 2: 50244 + 1: 50244 25,-11: - 2: 50244 + 1: 50244 25,-10: - 2: 50244 + 1: 50244 26,-12: - 2: 4369 + 1: 4369 26,-11: - 2: 4369 + 1: 4369 26,-10: - 2: 4369 + 1: 4369 26,-13: - 2: 4369 + 1: 4369 25,-15: - 2: 62576 + 1: 62576 25,-14: - 2: 50244 + 1: 50244 26,-15: - 2: 4368 + 1: 4368 26,-14: - 2: 4369 + 1: 4369 -18,-8: - 2: 17484 + 1: 17484 -18,-9: - 2: 17600 + 1: 17600 -18,-7: - 2: 17476 + 1: 17476 -18,-6: - 2: 17476 + 1: 17476 -17,-9: - 2: 16 + 1: 16 37,2: - 2: 1 + 1: 1 37,1: - 2: 8192 + 1: 8192 36,-2: - 2: 8192 + 1: 8192 37,-2: - 2: 528 + 1: 528 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -11959,21 +11953,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 235 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 immutable: True moles: @@ -11990,10 +11969,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14975 + temperature: 235 moles: - - 20.078888 - - 75.53487 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -14932,15 +14911,15 @@ entities: - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - - uid: 9169 + - uid: 498 components: - type: Transform - pos: 1.5,-52.5 + pos: 4.5,-52.5 parent: 1 - - uid: 9170 + - uid: 28484 components: - type: Transform - pos: 8.5,-52.5 + pos: -2.5,-52.5 parent: 1 - proto: AirlockExternalGlassShuttleEmergencyLocked entities: @@ -18279,6 +18258,11 @@ entities: parent: 1 - proto: AtmosDeviceFanDirectional entities: + - uid: 497 + components: + - type: Transform + pos: 4.5,-52.5 + parent: 1 - uid: 3354 components: - type: Transform @@ -18296,11 +18280,6 @@ entities: - type: Transform pos: -68.5,-2.5 parent: 1 - - uid: 9167 - components: - - type: Transform - pos: 1.5,-52.5 - parent: 1 - uid: 9168 components: - type: Transform @@ -18391,10 +18370,10 @@ entities: rot: -1.5707963267948966 rad pos: 140.5,0.5 parent: 1 - - uid: 28060 + - uid: 28485 components: - type: Transform - pos: 8.5,-52.5 + pos: -2.5,-52.5 parent: 1 - proto: AtmosDeviceFanTiny entities: @@ -19981,6 +19960,13 @@ entities: - type: Transform pos: 55.749737,-17.289125 parent: 1 +- proto: Biofabricator + entities: + - uid: 28477 + components: + - type: Transform + pos: 6.5,14.5 + parent: 1 - proto: BiomassReclaimer entities: - uid: 7642 @@ -56634,6 +56620,17 @@ entities: parent: 1 - proto: Chair entities: + - uid: 499 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-49.5 + parent: 1 + - uid: 519 + components: + - type: Transform + pos: -5.5,-48.5 + parent: 1 - uid: 835 components: - type: Transform @@ -56857,6 +56854,18 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,-8.5 parent: 1 + - uid: 9166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-49.5 + parent: 1 + - uid: 9167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-49.5 + parent: 1 - uid: 9309 components: - type: Transform @@ -56880,30 +56889,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-46.5 parent: 1 - - uid: 9363 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-49.5 - parent: 1 - - uid: 9364 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-49.5 - parent: 1 - - uid: 9365 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-49.5 - parent: 1 - - uid: 9366 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-49.5 - parent: 1 - uid: 9369 components: - type: Transform @@ -59600,15 +59585,15 @@ entities: - type: Transform pos: 61.5,11.5 parent: 1 - - uid: 9358 + - uid: 9165 components: - type: Transform - pos: 3.5,-49.5 + pos: -0.5,-49.5 parent: 1 - - uid: 9359 + - uid: 9354 components: - type: Transform - pos: 4.5,-49.5 + pos: 0.5,-49.5 parent: 1 - uid: 9385 components: @@ -59671,6 +59656,11 @@ entities: parent: 1 - proto: ClosetFireFilled entities: + - uid: 501 + components: + - type: Transform + pos: 2.5,-49.5 + parent: 1 - uid: 6505 components: - type: Transform @@ -59726,11 +59716,6 @@ entities: - type: Transform pos: 60.5,-0.5 parent: 1 - - uid: 9360 - components: - - type: Transform - pos: 6.5,-49.5 - parent: 1 - uid: 9386 components: - type: Transform @@ -60977,6 +60962,14 @@ entities: rot: -1.5707963267948966 rad pos: -7.9991593,-34.16382 parent: 1 +- proto: ClothingNeckShockCollar + entities: + - uid: 3797 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 64.49539,19.696146 + parent: 1 - proto: ClothingNeckStethoscope entities: - uid: 7360 @@ -61737,6 +61730,12 @@ entities: rot: -1.5707963267948966 rad pos: 126.5,2.5 parent: 1 + - uid: 28060 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,22.5 + parent: 1 - proto: ComputerAnalysisConsole entities: - uid: 4631 @@ -62079,14 +62078,6 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,-35.5 parent: 1 -- proto: ComputerShuttleSalvage - entities: - - uid: 5887 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,-51.5 - parent: 1 - proto: ComputerSolarControl entities: - uid: 2548 @@ -62524,6 +62515,27 @@ entities: - type: Transform pos: -9.5,24.5 parent: 1 + - uid: 23535 + components: + - type: Transform + pos: -34.5,-41.5 + parent: 1 + - uid: 23897 + components: + - type: Transform + pos: -34.5,-40.5 + parent: 1 + - uid: 23898 + components: + - type: Transform + pos: -34.5,-39.5 + parent: 1 + - uid: 23899 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-38.5 + parent: 1 - uid: 25590 components: - type: Transform @@ -62554,6 +62566,12 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-37.5 parent: 1 + - uid: 25757 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-38.5 + parent: 1 - uid: 26861 components: - type: Transform @@ -75710,20 +75728,17 @@ entities: - type: Transform pos: 27.5,12.5 parent: 1 - - uid: 3052 + - uid: 2620 components: - type: Transform - pos: 22.5,19.5 + rot: -1.5707963267948966 rad + pos: 20.5,-42.5 parent: 1 - - uid: 5441 + - uid: 3052 components: - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-44.5 + pos: 22.5,19.5 parent: 1 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 5593 components: - type: Transform @@ -75736,6 +75751,12 @@ entities: rot: 1.5707963267948966 rad pos: 84.5,-8.5 parent: 1 + - uid: 9164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-49.5 + parent: 1 - uid: 9654 components: - type: Transform @@ -75774,12 +75795,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-7.5 parent: 1 - - uid: 20148 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-49.5 - parent: 1 - uid: 20527 components: - type: Transform @@ -81801,6 +81816,13 @@ entities: rot: 3.141592653589793 rad pos: 50.361702,35.768944 parent: 1 +- proto: FoodKebabSkewer + entities: + - uid: 22779 + components: + - type: Transform + pos: -24.100885,16.586544 + parent: 1 - proto: FoodLollipop entities: - uid: 7633 @@ -81942,21 +81964,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 1083 - components: - - type: Transform - pos: 0.45228082,21.685434 - parent: 1 - - uid: 1084 - components: - - type: Transform - pos: 0.36894748,21.612469 - parent: 1 - - uid: 1085 - components: - - type: Transform - pos: 0.29603082,21.508228 - parent: 1 - uid: 22491 components: - type: Transform @@ -82087,18 +82094,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodMeatFish - entities: - - uid: 1081 - components: - - type: Transform - pos: -1.5998026,21.633316 - parent: 1 - - uid: 1082 - components: - - type: Transform - pos: -1.4643859,21.466534 - parent: 1 - proto: FoodMeatMeatball entities: - uid: 5192 @@ -82158,13 +82153,6 @@ entities: parent: 28448 - type: Physics canCollide: False -- proto: FoodMeatRatKebab - entities: - - uid: 22779 - components: - - type: Transform - pos: -24.100885,16.586544 - parent: 1 - proto: FoodMothBakedCheesePlatter entities: - uid: 6613 @@ -82388,10 +82376,10 @@ entities: - type: InsideEntityStorage - proto: FoodSnackRaisins entities: - - uid: 4303 + - uid: 9355 components: - type: Transform - pos: -4.5202436,-49.423706 + pos: -5.600837,-49.436836 parent: 1 - proto: FoodSnackSus entities: @@ -121780,36 +121768,11 @@ entities: - type: Transform pos: 7.5,44.5 parent: 1 - - uid: 497 - components: - - type: Transform - pos: 3.5,-50.5 - parent: 1 - - uid: 498 - components: - - type: Transform - pos: 11.5,-50.5 - parent: 1 - - uid: 501 - components: - - type: Transform - pos: 5.5,-50.5 - parent: 1 - - uid: 505 - components: - - type: Transform - pos: 4.5,-50.5 - parent: 1 - uid: 506 components: - type: Transform pos: 6.5,-50.5 parent: 1 - - uid: 511 - components: - - type: Transform - pos: -1.5,-50.5 - parent: 1 - uid: 512 components: - type: Transform @@ -121825,25 +121788,15 @@ entities: - type: Transform pos: -5.5,-50.5 parent: 1 - - uid: 517 - components: - - type: Transform - pos: 10.5,-50.5 - parent: 1 - uid: 520 components: - type: Transform pos: -4.5,-50.5 parent: 1 - - uid: 521 - components: - - type: Transform - pos: -2.5,-50.5 - parent: 1 - uid: 525 components: - type: Transform - pos: -3.5,-50.5 + pos: 7.5,-50.5 parent: 1 - uid: 544 components: @@ -121935,6 +121888,26 @@ entities: - type: Transform pos: -0.5,13.5 parent: 1 + - uid: 1081 + components: + - type: Transform + pos: 0.5,-50.5 + parent: 1 + - uid: 1082 + components: + - type: Transform + pos: 1.5,-50.5 + parent: 1 + - uid: 1083 + components: + - type: Transform + pos: -3.5,-51.5 + parent: 1 + - uid: 1084 + components: + - type: Transform + pos: 9.5,-50.5 + parent: 1 - uid: 1119 components: - type: Transform @@ -123665,6 +123638,11 @@ entities: - type: Transform pos: -51.5,-43.5 parent: 1 + - uid: 5887 + components: + - type: Transform + pos: -1.5,-51.5 + parent: 1 - uid: 5898 components: - type: Transform @@ -124285,25 +124263,15 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 - - uid: 9157 - components: - - type: Transform - pos: 0.5,-51.5 - parent: 1 - - uid: 9158 - components: - - type: Transform - pos: 2.5,-51.5 - parent: 1 - - uid: 9159 + - uid: 9149 components: - type: Transform - pos: 7.5,-51.5 + pos: 2.5,-50.5 parent: 1 - - uid: 9160 + - uid: 9151 components: - type: Transform - pos: 9.5,-51.5 + pos: 8.5,-50.5 parent: 1 - uid: 9187 components: @@ -124400,6 +124368,11 @@ entities: - type: Transform pos: 108.5,-4.5 parent: 1 + - uid: 9366 + components: + - type: Transform + pos: 5.5,-51.5 + parent: 1 - uid: 9546 components: - type: Transform @@ -125820,6 +125793,11 @@ entities: - type: Transform pos: -77.5,2.5 parent: 1 + - uid: 16921 + components: + - type: Transform + pos: 3.5,-51.5 + parent: 1 - uid: 17033 components: - type: Transform @@ -131572,21 +131550,6 @@ entities: - type: Transform pos: -27.56744,-29.258795 parent: 1 -- proto: MaterialReclaimer - entities: - - uid: 4115 - components: - - type: Transform - pos: -19.5,16.5 - parent: 1 -- proto: MaterialReclaimerMachineCircuitboard - entities: - - uid: 26575 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 74.434875,37.72442 - parent: 1 - proto: MaterialWoodPlank entities: - uid: 1973 @@ -132564,16 +132527,6 @@ entities: Quantity: 500 - proto: OatBushel entities: - - uid: 1086 - components: - - type: Transform - pos: -0.57993686,19.644781 - parent: 1 - - uid: 1089 - components: - - type: Transform - pos: -0.4653536,19.613508 - parent: 1 - uid: 4279 components: - type: Transform @@ -133694,6 +133647,42 @@ entities: rot: 3.141592653589793 rad pos: 121.267975,-8.274277 parent: 1 +- proto: PaperCNCSheet + entities: + - uid: 509 + components: + - type: Transform + pos: 33.744312,-15.581722 + parent: 1 + - uid: 511 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.37973,-15.362821 + parent: 1 + - uid: 513 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.37973,-14.518484 + parent: 1 + - uid: 517 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.619312,-14.612299 + parent: 1 + - uid: 518 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.66098,-15.289854 + parent: 1 + - uid: 28478 + components: + - type: Transform + pos: 34.41098,-15.498331 + parent: 1 - proto: PaperRolling1 entities: - uid: 1110 @@ -134022,6 +134011,24 @@ entities: - type: Transform pos: 100.689575,9.321493 parent: 1 + - uid: 28479 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.796398,-16.269701 + parent: 1 + - uid: 28480 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.775564,-16.384363 + parent: 1 + - uid: 28481 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.785982,-16.467754 + parent: 1 - proto: PersonalAI entities: - uid: 9884 @@ -135477,6 +135484,11 @@ entities: - type: Transform pos: 108.5,-3.5 parent: 1 + - uid: 9357 + components: + - type: Transform + pos: 9.5,-49.5 + parent: 1 - uid: 9387 components: - type: Transform @@ -136009,6 +136021,12 @@ entities: rot: 3.141592653589793 rad pos: 75.5,-9.5 parent: 1 + - uid: 9157 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-49.5 + parent: 1 - uid: 10065 components: - type: Transform @@ -136154,14 +136172,6 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 - - uid: 16919 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-49.5 - parent: 1 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 16920 components: - type: Transform @@ -137577,6 +137587,11 @@ entities: parent: 1 - proto: PoweredLightBlueInterior entities: + - uid: 1773 + components: + - type: Transform + pos: 11.5,-51.5 + parent: 1 - uid: 6757 components: - type: Transform @@ -137594,13 +137609,6 @@ entities: - type: Transform pos: 31.5,-51.5 parent: 1 - - uid: 16921 - components: - - type: Transform - pos: 12.5,-51.5 - parent: 1 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 17245 components: - type: Transform @@ -142146,6 +142154,13 @@ entities: - type: Transform pos: -3.5,-32.5 parent: 1 +- proto: RandomIngredient + entities: + - uid: 3360 + components: + - type: Transform + pos: -0.46056283,19.584528 + parent: 1 - proto: RandomInstruments entities: - uid: 2286 @@ -142410,6 +142425,18 @@ entities: - type: Transform pos: 97.5,-12.5 parent: 1 +- proto: RandomMeat + entities: + - uid: 2619 + components: + - type: Transform + pos: 0.46652067,21.544222 + parent: 1 + - uid: 4303 + components: + - type: Transform + pos: -1.4605628,21.544222 + parent: 1 - proto: RandomPainting entities: - uid: 3015 @@ -142893,25 +142920,20 @@ entities: parent: 1 - proto: RandomProduce entities: - - uid: 5176 - components: - - type: Transform - pos: 73.5,25.5 - parent: 1 - - uid: 7326 + - uid: 3695 components: - type: Transform pos: -1.5,19.5 parent: 1 - - uid: 7327 + - uid: 4115 components: - type: Transform pos: -1.5,19.5 parent: 1 - - uid: 7328 + - uid: 5176 components: - type: Transform - pos: -1.5,19.5 + pos: 73.5,25.5 parent: 1 - uid: 18958 components: @@ -142923,11 +142945,6 @@ entities: - type: Transform pos: 73.5,25.5 parent: 1 - - uid: 25757 - components: - - type: Transform - pos: -1.5,19.5 - parent: 1 - uid: 28371 components: - type: Transform @@ -143303,10 +143320,10 @@ entities: - type: Transform pos: 29.5,-9.5 parent: 1 - - uid: 9357 + - uid: 9169 components: - type: Transform - pos: 5.5,-49.5 + pos: 1.5,-49.5 parent: 1 - uid: 9367 components: @@ -143471,6 +143488,11 @@ entities: parent: 1 - proto: Recycler entities: + - uid: 507 + components: + - type: Transform + pos: -34.5,-40.5 + parent: 1 - uid: 3555 components: - type: Transform @@ -144999,25 +145021,15 @@ entities: - type: Transform pos: -55.5,23.5 parent: 1 - - uid: 509 - components: - - type: Transform - pos: -1.5,-50.5 - parent: 1 - uid: 510 components: - type: Transform pos: -5.5,-50.5 parent: 1 - - uid: 513 - components: - - type: Transform - pos: -2.5,-50.5 - parent: 1 - - uid: 519 + - uid: 521 components: - type: Transform - pos: -3.5,-50.5 + pos: 1.5,-50.5 parent: 1 - uid: 523 components: @@ -145044,6 +145056,16 @@ entities: - type: Transform pos: 13.5,-36.5 parent: 1 + - uid: 1085 + components: + - type: Transform + pos: -3.5,-51.5 + parent: 1 + - uid: 1089 + components: + - type: Transform + pos: 5.5,-51.5 + parent: 1 - uid: 1257 components: - type: Transform @@ -145889,6 +145911,11 @@ entities: - type: Transform pos: 88.5,1.5 parent: 1 + - uid: 5999 + components: + - type: Transform + pos: -1.5,-51.5 + parent: 1 - uid: 6016 components: - type: Transform @@ -146124,6 +146151,16 @@ entities: - type: Transform pos: 105.5,-3.5 parent: 1 + - uid: 7327 + components: + - type: Transform + pos: 2.5,-50.5 + parent: 1 + - uid: 7328 + components: + - type: Transform + pos: 0.5,-50.5 + parent: 1 - uid: 7478 components: - type: Transform @@ -146204,36 +146241,16 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 - - uid: 9149 - components: - - type: Transform - pos: 3.5,-50.5 - parent: 1 - uid: 9150 components: - type: Transform - pos: 4.5,-50.5 - parent: 1 - - uid: 9151 - components: - - type: Transform - pos: 5.5,-50.5 + pos: 7.5,-50.5 parent: 1 - uid: 9152 components: - type: Transform pos: 6.5,-50.5 parent: 1 - - uid: 9153 - components: - - type: Transform - pos: 10.5,-50.5 - parent: 1 - - uid: 9154 - components: - - type: Transform - pos: 11.5,-50.5 - parent: 1 - uid: 9155 components: - type: Transform @@ -146244,25 +146261,10 @@ entities: - type: Transform pos: 14.5,-50.5 parent: 1 - - uid: 9161 - components: - - type: Transform - pos: 0.5,-51.5 - parent: 1 - - uid: 9162 - components: - - type: Transform - pos: 2.5,-51.5 - parent: 1 - uid: 9163 components: - type: Transform - pos: 7.5,-51.5 - parent: 1 - - uid: 9164 - components: - - type: Transform - pos: 9.5,-51.5 + pos: 3.5,-51.5 parent: 1 - uid: 9202 components: @@ -147114,6 +147116,11 @@ entities: - type: Transform pos: 57.5,34.5 parent: 1 + - uid: 16919 + components: + - type: Transform + pos: 9.5,-50.5 + parent: 1 - uid: 17126 components: - type: Transform @@ -147164,6 +147171,11 @@ entities: - type: Transform pos: -63.5,-8.5 parent: 1 + - uid: 20148 + components: + - type: Transform + pos: 8.5,-50.5 + parent: 1 - uid: 20231 components: - type: Transform @@ -147657,6 +147669,13 @@ entities: - type: Transform pos: 102.49735,24.384338 parent: 1 +- proto: Roboisseur + entities: + - uid: 2617 + components: + - type: Transform + pos: 10.5,22.5 + parent: 1 - proto: RobustHarvestChemistryBottle entities: - uid: 1208 @@ -147707,6 +147726,14 @@ entities: - type: Transform pos: 78.49963,25.49577 parent: 1 +- proto: RubberChicken + entities: + - uid: 508 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.567345,-28.532404 + parent: 1 - proto: SalvageCanisterSpawner entities: - uid: 6512 @@ -148900,14 +148927,6 @@ entities: rot: 3.141592653589793 rad pos: 29.332079,26.503263 parent: 1 -- proto: ShockCollar - entities: - - uid: 3797 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 64.49539,19.696146 - parent: 1 - proto: Shovel entities: - uid: 1203 @@ -151344,42 +151363,37 @@ entities: parent: 1 - proto: SignNanotrasen1 entities: - - uid: 2616 + - uid: 9162 components: - type: Transform - rot: 3.141592653589793 rad pos: 42.5,1.5 parent: 1 - proto: SignNanotrasen2 entities: - - uid: 2617 + - uid: 9161 components: - type: Transform - rot: 3.141592653589793 rad pos: 43.5,1.5 parent: 1 - proto: SignNanotrasen3 entities: - - uid: 2618 + - uid: 9160 components: - type: Transform - rot: 3.141592653589793 rad pos: 44.5,1.5 parent: 1 - proto: SignNanotrasen4 entities: - - uid: 2619 + - uid: 9159 components: - type: Transform - rot: 3.141592653589793 rad pos: 45.5,1.5 parent: 1 - proto: SignNanotrasen5 entities: - - uid: 2620 + - uid: 9158 components: - type: Transform - rot: 3.141592653589793 rad pos: 46.5,1.5 parent: 1 - proto: SignNews @@ -151749,15 +151763,15 @@ entities: parent: 1 - proto: SilverDoor entities: - - uid: 9165 + - uid: 21480 components: - type: Transform - pos: 1.5,-50.5 + pos: 4.5,-50.5 parent: 1 - - uid: 9166 + - uid: 28486 components: - type: Transform - pos: 8.5,-50.5 + pos: -2.5,-50.5 parent: 1 - proto: SilverOre1 entities: @@ -153719,35 +153733,35 @@ entities: parent: 1 - proto: SpawnPointLatejoin entities: - - uid: 1763 + - uid: 500 components: - type: Transform - pos: 2.5,-49.5 + pos: -2.5,-49.5 parent: 1 - - uid: 1773 + - uid: 504 components: - type: Transform - pos: 7.5,-49.5 + pos: 5.5,-49.5 parent: 1 - - uid: 2984 + - uid: 505 components: - type: Transform - pos: 8.5,-49.5 + pos: 3.5,-49.5 parent: 1 - - uid: 3360 + - uid: 5441 components: - type: Transform - pos: 0.5,-49.5 + pos: 4.5,-49.5 parent: 1 - - uid: 3695 + - uid: 9358 components: - type: Transform - pos: 9.5,-49.5 + pos: -1.5,-49.5 parent: 1 - - uid: 5999 + - uid: 9364 components: - type: Transform - pos: 1.5,-49.5 + pos: -3.5,-49.5 parent: 1 - uid: 19601 components: @@ -153820,6 +153834,11 @@ entities: - type: Transform pos: 29.5,-13.5 parent: 1 + - uid: 9360 + components: + - type: Transform + pos: -4.5,-49.5 + parent: 1 - uid: 9505 components: - type: Transform @@ -153860,11 +153879,6 @@ entities: - type: Transform pos: 36.5,-36.5 parent: 1 - - uid: 21556 - components: - - type: Transform - pos: -5.5,-49.5 - parent: 1 - uid: 21557 components: - type: Transform @@ -153937,6 +153951,11 @@ entities: - type: Transform pos: 87.5,-14.5 parent: 1 + - uid: 9359 + components: + - type: Transform + pos: 6.5,-49.5 + parent: 1 - uid: 11575 components: - type: Transform @@ -153968,11 +153987,6 @@ entities: - type: Transform pos: 84.5,-14.5 parent: 1 - - uid: 23897 - components: - - type: Transform - pos: -0.5,-49.5 - parent: 1 - proto: SpawnPointMedicalIntern entities: - uid: 12107 @@ -154002,18 +154016,23 @@ entities: parent: 1 - proto: SpawnPointMime entities: - - uid: 13793 + - uid: 503 components: - type: Transform - pos: 20.5,-33.5 + pos: 12.5,-49.5 parent: 1 - - uid: 23898 + - uid: 13793 components: - type: Transform - pos: -2.5,-49.5 + pos: 20.5,-33.5 parent: 1 - proto: SpawnPointMusician entities: + - uid: 502 + components: + - type: Transform + pos: 8.5,-49.5 + parent: 1 - uid: 10037 components: - type: Transform @@ -154034,11 +154053,6 @@ entities: - type: Transform pos: 30.5,-36.5 parent: 1 - - uid: 23899 - components: - - type: Transform - pos: -3.5,-49.5 - parent: 1 - proto: SpawnPointObserver entities: - uid: 4719 @@ -155866,6 +155880,17 @@ entities: id: Hallway-(Engine) - proto: SurveillanceCameraGeneral entities: + - uid: 2984 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-46.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals - uid: 14395 components: - type: Transform @@ -156035,16 +156060,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Hallway-(Park/Arcade) - - uid: 21505 - components: - - type: Transform - pos: 2.5,-49.5 - parent: 1 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Arrivals - uid: 21511 components: - type: Transform @@ -158247,23 +158262,21 @@ entities: - type: Transform pos: 53.5,27.5 parent: 1 - - uid: 9354 + - uid: 9170 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-49.5 + pos: 7.5,-49.5 parent: 1 - - uid: 9355 + - uid: 9356 components: - type: Transform rot: 3.141592653589793 rad - pos: -1.5,-49.5 + pos: -1.5,-46.5 parent: 1 - - uid: 9356 + - uid: 9363 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-46.5 + pos: -5.5,-49.5 parent: 1 - uid: 9368 components: @@ -160972,6 +160985,37 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 26575 + components: + - type: Transform + pos: -35.5,-40.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 23535: + - Left: Forward + - Right: Reverse + - Middle: Off + 507: + - Left: Forward + - Right: Reverse + - Middle: Off + 23897: + - Left: Forward + - Right: Reverse + - Middle: Off + 23898: + - Left: Forward + - Right: Reverse + - Middle: Off + 23899: + - Left: Forward + - Right: Reverse + - Middle: Off + 25757: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 12302 @@ -162367,51 +162411,11 @@ entities: - type: Transform pos: -14.5,20.5 parent: 1 - - uid: 499 - components: - - type: Transform - pos: 2.5,-52.5 - parent: 1 - - uid: 500 - components: - - type: Transform - pos: 0.5,-50.5 - parent: 1 - - uid: 502 - components: - - type: Transform - pos: 9.5,-50.5 - parent: 1 - - uid: 503 - components: - - type: Transform - pos: 7.5,-52.5 - parent: 1 - - uid: 504 - components: - - type: Transform - pos: 2.5,-50.5 - parent: 1 - - uid: 507 - components: - - type: Transform - pos: 9.5,-52.5 - parent: 1 - - uid: 508 - components: - - type: Transform - pos: 7.5,-50.5 - parent: 1 - uid: 516 components: - type: Transform pos: -6.5,-50.5 parent: 1 - - uid: 518 - components: - - type: Transform - pos: 0.5,-52.5 - parent: 1 - uid: 522 components: - type: Transform @@ -163222,6 +163226,11 @@ entities: - type: Transform pos: 9.5,-34.5 parent: 1 + - uid: 1086 + components: + - type: Transform + pos: -3.5,-50.5 + parent: 1 - uid: 1087 components: - type: Transform @@ -164087,6 +164096,11 @@ entities: - type: Transform pos: -23.5,-7.5 parent: 1 + - uid: 1763 + components: + - type: Transform + pos: 3.5,-52.5 + parent: 1 - uid: 1770 components: - type: Transform @@ -165012,6 +165026,16 @@ entities: - type: Transform pos: -40.5,-2.5 parent: 1 + - uid: 2616 + components: + - type: Transform + pos: 11.5,-50.5 + parent: 1 + - uid: 2618 + components: + - type: Transform + pos: 10.5,-50.5 + parent: 1 - uid: 2691 components: - type: Transform @@ -169917,6 +169941,11 @@ entities: - type: Transform pos: 56.5,-4.5 parent: 1 + - uid: 7326 + components: + - type: Transform + pos: -1.5,-50.5 + parent: 1 - uid: 7331 components: - type: Transform @@ -170632,6 +170661,16 @@ entities: - type: Transform pos: 43.5,39.5 parent: 1 + - uid: 9153 + components: + - type: Transform + pos: 3.5,-50.5 + parent: 1 + - uid: 9154 + components: + - type: Transform + pos: 5.5,-52.5 + parent: 1 - uid: 9171 components: - type: Transform @@ -170727,6 +170766,11 @@ entities: - type: Transform pos: 107.5,9.5 parent: 1 + - uid: 9365 + components: + - type: Transform + pos: 5.5,-50.5 + parent: 1 - uid: 9547 components: - type: Transform @@ -174717,6 +174761,16 @@ entities: - type: Transform pos: 135.5,7.5 parent: 1 + - uid: 28482 + components: + - type: Transform + pos: -1.5,-52.5 + parent: 1 + - uid: 28483 + components: + - type: Transform + pos: -3.5,-52.5 + parent: 1 - proto: WallSolid entities: - uid: 2 @@ -180793,15 +180847,15 @@ entities: - type: Transform pos: 79.5,13.5 parent: 1 - - uid: 21480 + - uid: 21505 components: - type: Transform - pos: 76.5,23.5 + pos: 77.5,23.5 parent: 1 - - uid: 23535 + - uid: 21556 components: - type: Transform - pos: 77.5,23.5 + pos: 76.5,23.5 parent: 1 - proto: WallWood entities: @@ -182319,7 +182373,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12887.691 + secondsUntilStateChange: -17132.03 state: Opening - uid: 5096 components: @@ -182341,7 +182395,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12887.691 + secondsUntilStateChange: -17132.03 state: Opening - uid: 5498 components: @@ -182357,7 +182411,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12611.309 + secondsUntilStateChange: -16855.646 state: Opening - uid: 8696 components: @@ -182390,7 +182444,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12609.425 + secondsUntilStateChange: -16853.764 state: Opening - uid: 18835 components: @@ -182402,7 +182456,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12606.426 + secondsUntilStateChange: -16850.764 state: Opening - uid: 23917 components: @@ -184166,6 +184220,21 @@ entities: rot: 3.141592653589793 rad pos: 71.5,-16.5 parent: 1 + - uid: 28474 + components: + - type: Transform + pos: -58.5,36.5 + parent: 1 + - uid: 28475 + components: + - type: Transform + pos: -57.5,36.5 + parent: 1 + - uid: 28476 + components: + - type: Transform + pos: -59.5,36.5 + parent: 1 - proto: Wirecutter entities: - uid: 21445 From ae777b80e963013956ce459d967ee73b82a0d9a6 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 26 Sep 2024 02:04:35 +0000 Subject: [PATCH 013/561] glacier update (#1876) * glacier update * fax * other --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> --- Resources/Maps/glacier.yml | 1240 ++++++++++++++++++++++++++---------- 1 file changed, 915 insertions(+), 325 deletions(-) diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index b1b06eeed7f..8ab44a7cc2a 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -9694,9 +9694,9 @@ entities: 0: 111 -4,12: 0: 30583 - 3: 34952 + 2: 34952 -4,10: - 2: 12 + 3: 12 0: 52224 -4,11: 0: 3276 @@ -9704,12 +9704,12 @@ entities: 0: 118 -3,10: 0: 4352 - 3: 26214 + 2: 26214 -3,11: 0: 281 - 3: 26214 + 2: 26214 -3,12: - 3: 63351 + 2: 63351 -2,9: 0: 2039 -2,10: @@ -9718,7 +9718,7 @@ entities: 0: 30591 -2,12: 0: 119 - 3: 61440 + 2: 61440 -1,9: 0: 30711 -1,10: @@ -9727,16 +9727,16 @@ entities: 0: 30503 -1,12: 0: 119 - 3: 61440 + 2: 61440 0,8: 0: 63351 0,9: 0: 63736 0,10: - 3: 61712 + 2: 61712 0: 232 0,11: - 3: 16255 + 2: 16255 0,-4: 0: 60428 0,-3: @@ -9852,17 +9852,17 @@ entities: 4,7: 0: 61663 0,12: - 3: 64443 + 2: 64443 1,9: 0: 32767 1,10: 0: 35507 - 3: 12288 + 2: 12288 1,11: - 3: 8994 + 2: 8994 0: 34944 1,12: - 3: 291 + 2: 291 2,9: 0: 4095 2,10: @@ -9879,7 +9879,7 @@ entities: 0: 65534 3,12: 0: 28927 - 3: 32768 + 2: 32768 4,8: 0: 65294 4,9: @@ -9994,7 +9994,7 @@ entities: 0: 56831 4,12: 0: 255 - 3: 61440 + 2: 61440 5,9: 0: 3838 5,10: @@ -10003,7 +10003,7 @@ entities: 0: 65528 5,12: 0: 33535 - 3: 28672 + 2: 28672 6,9: 0: 61439 6,10: @@ -10160,16 +10160,16 @@ entities: 0: 43008 10,12: 0: 19 - 3: 27784 + 2: 27784 11,9: 0: 65534 11,10: 0: 56559 11,11: 0: 477 - 3: 17408 + 2: 17408 11,12: - 3: 4407 + 2: 4407 12,8: 0: 30583 12,9: @@ -10179,76 +10179,76 @@ entities: 12,11: 0: 3327 0,13: - 3: 43929 + 2: 43929 -1,13: - 3: 2039 + 2: 2039 0,14: - 3: 61038 + 2: 61038 0: 128 -1,14: 0: 65535 0,15: - 3: 61166 + 2: 61166 -1,15: 0: 15 4: 65280 0,16: - 3: 43942 + 2: 43942 0: 8 1,13: - 3: 273 + 2: 273 0: 8 1,14: - 3: 51711 + 2: 51711 1,15: - 3: 39127 + 2: 39127 0: 8 1,16: - 3: 25823 + 2: 25823 2,13: 0: 3067 2,14: - 3: 60303 + 2: 60303 3,13: 0: 2867 - 3: 136 + 2: 136 3,14: 0: 65535 4,13: - 3: 255 + 2: 255 0: 36608 4,14: 0: 65535 5,13: - 3: 30583 + 2: 30583 0: 34952 5,14: - 3: 1911 + 2: 1911 0: 63624 6,13: 0: 61167 6,14: - 3: 45552 + 2: 45552 5,15: 0: 8 6,15: 0: 34959 7,13: 0: 13107 - 3: 34952 + 2: 34952 7,14: - 3: 62200 + 2: 62200 6,16: 0: 136 - 3: 34816 + 2: 34816 7,15: 0: 27718 7,16: 0: 53106 8,13: - 3: 17615 + 2: 17615 8,14: - 3: 5828 + 2: 5828 0: 8192 12,4: 0: 6 @@ -10266,25 +10266,25 @@ entities: 0: 61439 15,6: 0: 20480 - 3: 35840 + 2: 35840 15,7: 0: 61661 16,6: - 3: 12288 + 2: 12288 16,7: 0: 61489 - 3: 70 + 2: 70 6,17: - 3: 2184 + 2: 2184 7,17: - 3: 25138 + 2: 25138 0: 34956 7,18: - 3: 36386 + 2: 36386 0: 8 8,18: 0: 241 - 3: 61952 + 2: 61952 13,9: 0: 28671 13,10: @@ -10309,10 +10309,10 @@ entities: 0: 28912 16,9: 0: 61489 - 3: 70 + 2: 70 16,10: 0: 12528 - 3: 16384 + 2: 16384 16,11: 0: 1 13,0: @@ -10323,7 +10323,7 @@ entities: 0: 12407 13,3: 0: 51 - 3: 1024 + 2: 1024 13,-1: 0: 34963 -8,4: @@ -10428,20 +10428,20 @@ entities: 4,-6: 0: 33075 -8,-3: - 3: 12544 + 2: 12544 -9,-3: 0: 64250 - 3: 1285 + 2: 1285 -8,-1: 0: 61731 -9,-2: 0: 64170 - 3: 1365 + 2: 1365 -9,-1: 0: 64174 - 3: 1361 + 2: 1361 -8,-2: - 3: 512 + 2: 512 -8,0: 0: 65526 -7,-3: @@ -10450,7 +10450,7 @@ entities: 0: 62321 -7,-5: 0: 24576 - 3: 119 + 2: 119 -7,-4: 0: 49152 -7,-2: @@ -10471,27 +10471,27 @@ entities: 0: 30513 -9,0: 0: 64170 - 3: 1365 + 2: 1365 -8,1: - 3: 1799 + 2: 1799 0: 2296 -9,1: 0: 64250 - 3: 1285 + 2: 1285 -8,2: 0: 64384 -9,2: 0: 51200 - 3: 1 + 2: 1 -9,3: 0: 47308 -7,1: - 3: 1799 + 2: 1799 0: 2296 -7,2: 0: 65392 -6,1: - 3: 263 + 2: 263 0: 248 -6,2: 0: 52424 @@ -10502,32 +10502,32 @@ entities: 8,16: 0: 204 9,13: - 3: 34959 + 2: 34959 9,14: - 3: 248 + 2: 248 0: 62464 9,15: 0: 4351 9,16: 0: 65535 10,13: - 3: 3 + 2: 3 10,14: 0: 36864 - 3: 32 + 2: 32 10,15: 0: 61499 10,16: 0: 4539 11,14: - 3: 8177 + 2: 8177 0: 57344 11,15: 0: 207 11,13: - 3: 4401 + 2: 4401 12,14: - 3: 12561 + 2: 12561 12,15: 0: 8209 11,16: @@ -10548,10 +10548,10 @@ entities: 0: 65535 -12,3: 0: 49151 - 3: 16384 + 2: 16384 -13,3: 0: 9215 - 3: 56320 + 2: 56320 -11,0: 0: 65535 -11,1: @@ -10559,7 +10559,7 @@ entities: -11,2: 0: 65535 -11,3: - 3: 1799 + 2: 1799 0: 63736 -11,-1: 0: 65535 @@ -10569,12 +10569,12 @@ entities: 0: 65535 -10,1: 0: 63999 - 3: 1536 + 2: 1536 -10,2: - 3: 1285 + 2: 1285 0: 31482 -10,3: - 3: 773 + 2: 773 0: 12338 -10,-1: 0: 65535 @@ -10588,19 +10588,19 @@ entities: 0: 61183 -13,5: 0: 58468 - 3: 2 + 2: 2 -13,6: 0: 26188 - 3: 48 + 2: 48 -12,7: 0: 45056 - 3: 16384 + 2: 16384 -12,8: - 3: 1799 + 2: 1799 0: 12536 -13,7: 0: 57344 - 3: 4914 + 2: 4914 -11,5: 0: 30583 -11,6: @@ -10608,7 +10608,7 @@ entities: -11,7: 0: 61986 -11,8: - 3: 1797 + 2: 1797 0: 59642 -10,6: 0: 52479 @@ -10617,7 +10617,7 @@ entities: -10,5: 0: 52430 -10,8: - 3: 771 + 2: 771 0: 29812 -9,6: 0: 12545 @@ -10626,7 +10626,7 @@ entities: -12,-4: 0: 61440 -12,-3: - 3: 1799 + 2: 1799 0: 63736 -13,-3: 0: 3935 @@ -10638,28 +10638,28 @@ entities: 0: 65535 -11,-4: 0: 12288 - 3: 16384 + 2: 16384 -11,-3: - 3: 1807 + 2: 1807 0: 63728 -11,-2: 0: 65535 -10,-3: - 3: 1797 + 2: 1797 0: 63736 -10,-2: 0: 65535 -10,-4: - 3: 6152 + 2: 6152 0: 49152 -10,-5: 0: 34952 -9,-4: - 3: 1365 + 2: 1365 0: 64170 -9,-5: 0: 64175 - 3: 1360 + 2: 1360 -16,-4: 0: 28671 -16,-5: @@ -10676,19 +10676,19 @@ entities: 0: 28398 -16,-1: 0: 49138 - 3: 16384 + 2: 16384 -17,-1: 0: 2240 - 3: 32768 + 2: 32768 -16,0: - 3: 1 + 2: 1 0: 1150 -15,-4: 0: 819 - 3: 32768 + 2: 32768 -15,-3: 0: 819 - 3: 34952 + 2: 34952 -15,-2: 0: 13107 -15,-1: @@ -10703,41 +10703,41 @@ entities: 0: 65534 -14,-4: 0: 57344 - 3: 64 + 2: 64 -14,-2: - 3: 15 + 2: 15 0: 51328 -14,0: 0: 65535 -13,-4: 0: 28672 - 3: 144 + 2: 144 -10,-6: 0: 32768 -9,-6: 0: 61440 -8,-5: - 3: 255 + 2: 255 -16,-6: - 3: 15 + 2: 15 0: 63232 -17,-6: - 3: 74 + 2: 74 0: 61696 -17,-5: 0: 57561 -16,-7: - 3: 8192 + 2: 8192 -15,-6: - 3: 16400 + 2: 16400 0: 45056 -14,-6: 0: 4096 - 3: 8192 + 2: 8192 -14,-5: - 3: 4352 + 2: 4352 -17,0: - 3: 8 + 2: 8 0: 2240 -16,1: 0: 3824 @@ -10754,7 +10754,7 @@ entities: -16,4: 0: 65535 -15,1: - 3: 752 + 2: 752 0: 8456 -15,3: 0: 20447 @@ -10762,29 +10762,29 @@ entities: 0: 50786 -15,4: 0: 9830 - 3: 2048 + 2: 2048 -14,1: 0: 61439 -14,2: 0: 62606 - 3: 320 + 2: 320 -14,3: 0: 8191 - 3: 57344 + 2: 57344 -14,4: - 3: 1834 + 2: 1834 0: 34944 -13,4: 0: 24578 - 3: 544 + 2: 544 -18,-7: - 3: 2112 + 2: 2112 -18,-6: 0: 51396 -18,-5: 0: 12 -17,-7: - 3: 40064 + 2: 40064 -19,2: 0: 9319 -19,3: @@ -10852,7 +10852,7 @@ entities: 0: 7103 8,-9: 0: 57344 - 3: 224 + 2: 224 9,-8: 0: 53755 9,-7: @@ -10861,7 +10861,7 @@ entities: 0: 4081 9,-9: 0: 47296 - 3: 16 + 2: 16 10,-8: 0: 56343 10,-7: @@ -10991,22 +10991,22 @@ entities: 17,-2: 0: 34955 17,-1: - 3: 22016 + 2: 22016 0: 43208 17,0: 0: 30475 - 3: 4 + 2: 4 18,-3: 0: 30591 18,-2: 0: 25207 - 3: 5376 + 2: 5376 18,-1: 0: 61203 - 3: 4196 + 2: 4196 18,0: 0: 49117 - 3: 16418 + 2: 16418 19,-3: 0: 49087 19,-1: @@ -11041,7 +11041,7 @@ entities: 0: 65532 -13,8: 0: 43257 - 3: 1798 + 2: 1798 -11,9: 0: 3104 -10,9: @@ -11064,40 +11064,40 @@ entities: 0: 65394 -14,7: 0: 45736 - 3: 19522 + 2: 19522 -14,8: 0: 9386 - 3: 51780 + 2: 51780 -4,13: 0: 119 - 3: 62600 + 2: 62600 -5,13: 0: 30632 -4,14: - 3: 65023 + 2: 65023 -5,14: - 3: 21882 + 2: 21882 0: 5 -4,15: - 3: 4383 + 2: 4383 -5,15: - 3: 29772 + 2: 29772 -4,16: - 3: 18255 + 2: 18255 -3,13: - 3: 14071 + 2: 14071 -3,14: - 3: 13107 + 2: 13107 0: 34952 -3,15: - 3: 8739 + 2: 8739 0: 8 4: 34816 -3,16: - 3: 60963 + 2: 60963 4: 8 -2,13: - 3: 3324 + 2: 3324 0: 49152 -2,14: 0: 65535 @@ -11106,64 +11106,64 @@ entities: 4: 65280 -2,16: 4: 15 - 3: 65280 + 2: 65280 -1,16: 4: 15 - 3: 7936 + 2: 7936 -5,16: - 3: 7962 + 2: 7962 0: 16452 -4,17: - 3: 47332 + 2: 47332 0: 16384 -5,17: - 3: 42567 + 2: 42567 0: 16384 -4,18: - 3: 35820 + 2: 35820 0: 1024 -5,18: - 3: 4030 + 2: 4030 -4,19: - 3: 51400 + 2: 51400 -3,17: - 3: 49722 + 2: 49722 0: 12288 -3,18: - 3: 3631 + 2: 3631 0: 256 -3,19: - 3: 4112 + 2: 4112 -4,20: - 3: 51400 + 2: 51400 -2,17: - 3: 61453 + 2: 61453 -2,18: - 3: 3455 + 2: 3455 0: 512 -1,17: - 3: 57617 + 2: 57617 0: 4096 -1,18: - 3: 36767 + 2: 36767 -1,19: - 3: 51400 + 2: 51400 0,17: - 3: 30891 + 2: 30891 0: 32768 0,18: - 3: 185 + 2: 185 0: 256 0,19: - 3: 4112 + 2: 4112 -1,20: - 3: 51400 + 2: 51400 1,17: - 3: 4372 + 2: 4372 1,18: - 3: 99 + 2: 99 2,16: - 3: 1 + 2: 1 -8,12: 0: 65328 -9,12: @@ -11179,9 +11179,9 @@ entities: -6,14: 0: 35055 -6,15: - 3: 34952 + 2: 34952 -6,16: - 3: 7960 + 2: 7960 0: 32896 21,-4: 0: 4096 @@ -11228,14 +11228,14 @@ entities: 15,-13: 0: 65409 21,-8: - 3: 32903 + 2: 32903 0: 32624 21,-7: - 3: 7 + 2: 7 22,-8: - 3: 18241 + 2: 18241 22,-7: - 3: 1 + 2: 1 -16,5: 0: 14199 -17,5: @@ -11246,23 +11246,23 @@ entities: 0: 61198 -15,5: 0: 4402 - 3: 17984 + 2: 17984 -15,6: - 3: 16 + 2: 16 0: 236 -14,6: 0: 8208 - 3: 224 + 2: 224 -14,5: - 3: 8 + 2: 8 -8,16: - 3: 20288 + 2: 20288 -7,16: - 3: 24400 + 2: 24400 -6,17: - 3: 34952 + 2: 34952 -6,18: - 3: 136 + 2: 136 0: 2048 12,16: 0: 23955 @@ -11270,39 +11270,39 @@ entities: 0: 1535 9,18: 0: 48 - 3: 62528 + 2: 62528 10,17: 0: 273 10,18: - 3: 63616 + 2: 63616 11,18: - 3: 15904 + 2: 15904 0: 4 11,17: 0: 2048 12,17: 0: 48 12,18: - 3: 1809 + 2: 1809 -7,-6: 0: 36864 - 3: 26222 + 2: 26222 -7,-8: - 3: 26342 + 2: 26342 -7,-9: - 3: 28262 + 2: 28262 -7,-7: - 3: 26222 + 2: 26222 -6,-8: - 3: 8244 + 2: 8244 0: 52424 -6,-7: - 3: 17 + 2: 17 0: 63342 -6,-6: 0: 179 -6,-9: - 3: 20300 + 2: 20300 0: 32768 -5,-8: 0: 63863 @@ -11310,7 +11310,7 @@ entities: 0: 34968 -5,-9: 0: 16382 - 3: 1 + 2: 1 -4,-8: 0: 17417 -4,-6: @@ -11384,20 +11384,20 @@ entities: 17,-14: 0: 4096 -3,20: - 3: 4112 + 2: 4112 -4,21: - 3: 136 + 2: 136 0,20: - 3: 4112 + 2: 4112 -1,21: - 3: 136 + 2: 136 -7,-10: 0: 2050 - 3: 26348 + 2: 26348 -6,-10: - 3: 17663 + 2: 17663 -5,-10: - 3: 17 + 2: 17 0: 51456 -5,-11: 0: 4096 @@ -11423,7 +11423,7 @@ entities: 1: 3 0: 3712 16,0: - 3: 4 + 2: 4 0: 51208 16,1: 0: 2248 @@ -11431,31 +11431,31 @@ entities: 0: 1911 18,1: 0: 4081 - 3: 14 + 2: 14 19,1: - 3: 13 + 2: 13 0: 3826 20,0: 0: 62208 - 3: 3072 + 2: 3072 20,1: 0: 1023 - 3: 3072 + 2: 3072 21,0: - 3: 9472 + 2: 9472 0: 4096 21,1: 0: 31 - 3: 3360 + 2: 3360 22,1: 0: 1367 - 3: 520 + 2: 520 22,0: - 3: 4096 + 2: 4096 23,1: - 3: 17 + 2: 17 23,0: - 3: 4096 + 2: 4096 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -11488,10 +11488,11 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True + temperature: 213.15 moles: - - 0 - - 6666.982 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -11503,11 +11504,10 @@ entities: - 0 - 0 - volume: 2500 - immutable: True - temperature: 213.15 + temperature: 293.15 moles: - - 21.824879 - - 82.10312 + - 0 + - 6666.982 - 0 - 0 - 0 @@ -11773,8 +11773,22 @@ entities: - 4145 - 4146 - 4147 + - uid: 6307 + components: + - type: MetaData + name: service room air alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,0.5 + parent: 2 + - type: DeviceList + devices: + - 9373 + - 9448 - uid: 8610 components: + - type: MetaData + name: teg air alarm - type: Transform pos: -3.5,61.5 parent: 2 @@ -11783,6 +11797,8 @@ entities: - 4760 - uid: 17596 components: + - type: MetaData + name: tool room air alarm - type: Transform rot: -1.5707963267948966 rad pos: 33.5,36.5 @@ -11797,12 +11813,16 @@ entities: - 17600 - uid: 17597 components: + - type: MetaData + name: central hall air alarm - type: Transform rot: 1.5707963267948966 rad pos: 20.5,22.5 parent: 2 - uid: 17598 components: + - type: MetaData + name: east hall air alarm - type: Transform rot: -1.5707963267948966 rad pos: 36.5,21.5 @@ -11827,6 +11847,8 @@ entities: - 17550 - uid: 17604 components: + - type: MetaData + name: chapel air alarm - type: Transform pos: 32.5,-14.5 parent: 2 @@ -11837,6 +11859,8 @@ entities: - 8249 - uid: 17605 components: + - type: MetaData + name: medical air alarm - type: Transform pos: 9.5,-0.5 parent: 2 @@ -11855,6 +11879,8 @@ entities: - 9435 - uid: 17606 components: + - type: MetaData + name: cryogenics air alarm - type: Transform pos: -2.5,-5.5 parent: 2 @@ -11864,6 +11890,143 @@ entities: - 9375 - 9296 - 9453 + - uid: 17929 + components: + - type: MetaData + name: mime air alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-4.5 + parent: 2 + - type: DeviceList + devices: + - 9372 + - 9449 + - uid: 17930 + components: + - type: MetaData + name: clown air alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-12.5 + parent: 2 + - type: DeviceList + devices: + - 9450 + - 9371 + - uid: 17931 + components: + - type: MetaData + name: public garden air alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-16.5 + parent: 2 + - type: DeviceList + devices: + - 9452 + - 9370 + - uid: 17932 + components: + - type: MetaData + name: boxing ring air alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-14.5 + parent: 2 + - type: DeviceList + devices: + - 9369 + - 9451 + - uid: 17933 + components: + - type: MetaData + name: perma air alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,17.5 + parent: 2 + - type: DeviceList + devices: + - 17936 + - 17935 + - 9293 + - 9437 + - 17937 + - 17934 + - uid: 17938 + components: + - type: MetaData + name: security air alarm + - type: Transform + pos: -17.5,20.5 + parent: 2 + - type: DeviceList + devices: + - 17939 + - 17940 + - 17942 + - 17943 + - 9368 + - 17944 + - uid: 17945 + components: + - type: MetaData + name: warden air alarm + - type: Transform + pos: -13.5,23.5 + parent: 2 + - type: DeviceList + devices: + - 9445 + - 9361 + - uid: 17946 + components: + - type: MetaData + name: brig air alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,21.5 + parent: 2 + - type: DeviceList + devices: + - 17947 + - 9443 + - 17939 + - 17940 + - 6196 + - 14340 + - 17614 + - 14342 + - uid: 17948 + components: + - type: MetaData + name: security lobby air alarm + - type: Transform + pos: -3.5,31.5 + parent: 2 + - type: DeviceList + devices: + - 9330 + - 9409 + - 9438 + - 9362 + - uid: 17949 + components: + - type: MetaData + name: security dorms air alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,35.5 + parent: 2 + - type: DeviceList + devices: + - 9440 + - 9366 + - 9364 + - 9441 + - 9365 + - 9442 - proto: AirAlarmAssembly entities: - uid: 12 @@ -13809,6 +13972,42 @@ entities: - type: DeviceNetwork deviceLists: - 8610 + - uid: 17934 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -28.5,12.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 + - uid: 17935 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.5,26.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 + - uid: 17936 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,26.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 + - uid: 17937 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,16.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 - proto: AltarSpawner entities: - uid: 241 @@ -15875,8 +16074,7 @@ entities: desc: Used for administering ten CCs of PAIN! name: The Doctor's Orders - type: Transform - rot: 3.141592653589793 rad - pos: 13.689892,-7.3280826 + pos: 13.626989,-7.2987084 parent: 2 - uid: 624 components: @@ -16364,6 +16562,13 @@ entities: - type: Transform pos: -1.5,49.5 parent: 2 +- proto: Biogenerator + entities: + - uid: 6400 + components: + - type: Transform + pos: 27.5,2.5 + parent: 2 - proto: BiomassReclaimer entities: - uid: 709 @@ -47504,6 +47709,12 @@ entities: parent: 2 - proto: ComputerAlert entities: + - uid: 14097 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,57.5 + parent: 2 - uid: 17148 components: - type: Transform @@ -48437,11 +48648,6 @@ entities: - type: Transform pos: 26.5,6.5 parent: 2 - - uid: 6400 - components: - - type: Transform - pos: 27.5,2.5 - parent: 2 - proto: CrateHydroSecure entities: - uid: 6401 @@ -49360,11 +49566,6 @@ entities: parent: 2 - proto: DefaultStationBeaconSalvage entities: - - uid: 6307 - components: - - type: Transform - pos: 80.5,4.5 - parent: 2 - uid: 9958 components: - type: Transform @@ -49376,7 +49577,7 @@ entities: pos: 89.5,4.5 parent: 2 - type: NavMapBeacon - text: Salvage Arm + text: Salvage Magnet - proto: DefaultStationBeaconScience entities: - uid: 10226 @@ -54771,6 +54972,12 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,43.5 parent: 2 + - uid: 17951 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-7.5 + parent: 2 - proto: EmergencyRollerBedSpawnFolded entities: - uid: 7221 @@ -54879,7 +55086,7 @@ entities: pos: 69.5,-7.5 parent: 2 - type: FaxMachine - name: Service, Reporter + name: Reporter's Office - uid: 7239 components: - type: Transform @@ -54921,21 +55128,21 @@ entities: pos: 20.5,-12.5 parent: 2 - type: FaxMachine - name: CMO's Room + name: Chief Medical Officer - uid: 7245 components: - type: Transform pos: 26.5,22.5 parent: 2 - type: FaxMachine - name: Service, HoP + name: Head of Personnel - uid: 7246 components: - type: Transform pos: 7.5,-13.5 parent: 2 - type: FaxMachine - name: Medical, Virology + name: Virology - uid: 7247 components: - type: Transform @@ -55135,6 +55342,18 @@ entities: - 17538 - 17537 - 17536 + - uid: 17941 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,17.5 + parent: 2 + - type: DeviceList + devices: + - 17939 + - 17940 + - 17942 + - 17943 - proto: FireAxeCabinetFilled entities: - uid: 7267 @@ -55168,6 +55387,27 @@ entities: deviceLists: - 10 - 9 +- proto: FirelockEdge + entities: + - uid: 17942 + components: + - type: Transform + pos: -22.5,18.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 + - uid: 17943 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,22.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 - proto: FirelockFrame entities: - uid: 7268 @@ -55439,6 +55679,26 @@ entities: deviceLists: - 11 - 17604 + - uid: 17939 + components: + - type: Transform + pos: -14.5,18.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 + - 17946 + - uid: 17940 + components: + - type: Transform + pos: -14.5,17.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 + - 17946 - proto: Fireplace entities: - uid: 7270 @@ -58633,13 +58893,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,49.5 parent: 2 - - uid: 12260 - components: - - type: Transform - pos: -7.5,18.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 12345 components: - type: Transform @@ -67489,14 +67742,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 8937 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,20.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 8938 components: - type: Transform @@ -69393,6 +69638,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 8937 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,18.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 9089 components: - type: Transform @@ -70486,6 +70739,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 12260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,20.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 12670 components: - type: Transform @@ -70998,6 +71259,9 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#0055CCFF' - uid: 6332 @@ -71092,6 +71356,9 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,19.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9294 @@ -71388,6 +71655,9 @@ entities: rot: 3.141592653589793 rad pos: -1.5,26.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9332 @@ -71614,6 +71884,9 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,22.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17945 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9362 @@ -71622,6 +71895,9 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,34.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9363 @@ -71637,6 +71913,9 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,37.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9365 @@ -71644,6 +71923,9 @@ entities: - type: Transform pos: -18.5,42.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9366 @@ -71652,6 +71934,9 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,31.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9368 @@ -71659,6 +71944,9 @@ entities: - type: Transform pos: -19.5,21.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17938 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9369 @@ -71667,6 +71955,9 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17932 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9370 @@ -71675,6 +71966,9 @@ entities: rot: 3.141592653589793 rad pos: -19.5,-16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17931 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9371 @@ -71683,6 +71977,9 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-9.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17930 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9372 @@ -71691,6 +71988,9 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,-2.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17929 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9373 @@ -71699,6 +71999,9 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,1.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 6307 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9374 @@ -71766,6 +72069,9 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#0055CCFF' - uid: 17864 @@ -71805,6 +72111,16 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 17947 + components: + - type: Transform + pos: -7.5,19.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 5443 @@ -72124,6 +72440,9 @@ entities: rot: 3.141592653589793 rad pos: -3.5,25.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#990000FF' - uid: 9410 @@ -72369,6 +72688,9 @@ entities: rot: 1.5707963267948966 rad pos: -29.5,20.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 - type: AtmosPipeColor color: '#990000FF' - uid: 9438 @@ -72377,6 +72699,9 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,32.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#990000FF' - uid: 9439 @@ -72392,6 +72717,9 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,30.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#990000FF' - uid: 9441 @@ -72400,6 +72728,9 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,36.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#990000FF' - uid: 9442 @@ -72407,6 +72738,9 @@ entities: - type: Transform pos: -17.5,41.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#990000FF' - uid: 9443 @@ -72415,6 +72749,9 @@ entities: rot: 3.141592653589793 rad pos: -6.5,19.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#990000FF' - uid: 9445 @@ -72423,6 +72760,9 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,20.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17945 - type: AtmosPipeColor color: '#990000FF' - uid: 9447 @@ -72439,6 +72779,9 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,-0.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 6307 - type: AtmosPipeColor color: '#990000FF' - uid: 9449 @@ -72447,6 +72790,9 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,-3.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17929 - type: AtmosPipeColor color: '#990000FF' - uid: 9450 @@ -72455,6 +72801,9 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-10.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17930 - type: AtmosPipeColor color: '#990000FF' - uid: 9451 @@ -72463,6 +72812,9 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-17.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17932 - type: AtmosPipeColor color: '#990000FF' - uid: 9452 @@ -72471,6 +72823,9 @@ entities: rot: 3.141592653589793 rad pos: -17.5,-17.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17931 - type: AtmosPipeColor color: '#990000FF' - uid: 9453 @@ -72500,6 +72855,9 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,15.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#990000FF' - uid: 14342 @@ -72508,6 +72866,9 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,15.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#990000FF' - uid: 16450 @@ -72585,6 +72946,16 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 17944 + components: + - type: Transform + pos: -21.5,21.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17938 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasVolumePump entities: - uid: 4223 @@ -72814,11 +73185,6 @@ entities: - type: Transform pos: -13.734782,10.56881 parent: 2 - - uid: 9485 - components: - - type: Transform - pos: 42.850143,-31.586727 - parent: 2 - proto: Grille entities: - uid: 462 @@ -95269,21 +95635,6 @@ entities: - type: Transform pos: 26.5,25.5 parent: 2 - - uid: 13238 - components: - - type: Transform - pos: 37.5,10.5 - parent: 2 - - uid: 13239 - components: - - type: Transform - pos: 38.5,10.5 - parent: 2 - - uid: 13240 - components: - - type: Transform - pos: 42.5,9.5 - parent: 2 - uid: 13241 components: - type: Transform @@ -100751,7 +101102,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai satellite 2 + id: AI Satellite 2 - uid: 10831 components: - type: Transform @@ -100762,7 +101113,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai satellite 1 + id: AI Satellite 1 - uid: 10833 components: - type: Transform @@ -100773,7 +101124,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai core + id: AI Core - uid: 11036 components: - type: Transform @@ -100784,7 +101135,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai satellite 3 + id: AI Satellite 3 - uid: 14090 components: - type: Transform @@ -100827,7 +101178,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: Control Room + id: Bridge - uid: 14094 components: - type: Transform @@ -100849,6 +101200,28 @@ entities: - SurveillanceCameraCommand nameSet: True id: Vault + - uid: 14101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Chief Engineer's Office + - uid: 14109 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-32.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Mysta's Room - uid: 16356 components: - type: Transform @@ -100858,7 +101231,40 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: bridge exterior + id: Bridge Exterior + - uid: 17962 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,41.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Courtyard + - uid: 17963 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,65.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Upload + - uid: 17969 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,13.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Logistics Officer's Office - proto: SurveillanceCameraEngineering entities: - uid: 5352 @@ -100894,16 +101300,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmospherics Lobby - - uid: 14097 - components: - - type: Transform - pos: -2.5,56.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Atmospherics Experiment Chambers - uid: 14100 components: - type: Transform @@ -100915,17 +101311,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: AME Room - - uid: 14101 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,40.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Chief Engineer's Office - uid: 14102 components: - type: Transform @@ -100946,7 +101331,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Robotics + id: Backup Power - uid: 14104 components: - type: Transform @@ -100969,8 +101354,71 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmospheric Upper Courtyard + - uid: 14156 + components: + - type: Transform + pos: 10.5,56.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Walkway + - uid: 17964 + components: + - type: Transform + pos: 9.5,51.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms + - uid: 17965 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,55.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Gravity + - uid: 17966 + components: + - type: Transform + pos: -4.5,66.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solar Control + - uid: 17967 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,56.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG Exterior - proto: SurveillanceCameraGeneral entities: + - uid: 13240 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,10.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Logistics Front - uid: 14106 components: - type: Transform @@ -100988,7 +101436,7 @@ entities: parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - - SurveillanceCameraGeneral + - SurveillanceCameraMedical nameSet: True id: Medical Front - uid: 14108 @@ -101000,17 +101448,6 @@ entities: - type: SurveillanceCamera nameSet: True id: Clothing Kiosk - - uid: 14109 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,10.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Cargo Front - uid: 14110 components: - type: Transform @@ -101064,6 +101501,60 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Evacuation + - uid: 17953 + components: + - type: Transform + pos: 49.5,-12.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cryosleep + - uid: 17955 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,-0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Disposals + - uid: 17959 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,21.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Central Hall + - uid: 17960 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,10.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Botany Hall + - uid: 17961 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,35.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Tool Room - proto: SurveillanceCameraMedical entities: - uid: 13913 @@ -101164,6 +101655,17 @@ entities: - SurveillanceCameraMedical nameSet: True id: Chemistry Lab + - uid: 17950 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-7.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Morgue - proto: SurveillanceCameraRouterCommand entities: - uid: 17901 @@ -101273,17 +101775,6 @@ entities: - SurveillanceCameraScience nameSet: True id: Lockers - - uid: 14135 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-27.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraScience - nameSet: True - id: Artifact Chamber - uid: 14136 components: - type: Transform @@ -101305,6 +101796,16 @@ entities: - SurveillanceCameraScience nameSet: True id: Forensic Mantis' Office + - uid: 17971 + components: + - type: Transform + pos: 34.5,-32.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Lab - proto: SurveillanceCameraSecurity entities: - uid: 14139 @@ -101447,6 +101948,38 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Courtroom + - uid: 17956 + components: + - type: Transform + pos: -21.5,18.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Visitation + - uid: 17957 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,22.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Warden's Room + - uid: 17958 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Brig Cells - proto: SurveillanceCameraService entities: - uid: 14153 @@ -101481,41 +102014,63 @@ entities: - SurveillanceCameraService nameSet: True id: Hydroponics - - uid: 14156 + - uid: 14157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,41.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Musician's Room + - uid: 14158 components: - type: Transform rot: -1.5707963267948966 rad - pos: 43.5,10.5 + pos: 7.5,15.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Cargo - - uid: 14157 + id: Kitchen + - uid: 17952 components: - type: Transform rot: 1.5707963267948966 rad - pos: 55.5,41.5 + pos: 39.5,3.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Musician's Room - - uid: 14158 + id: Janitor's Closet + - uid: 17954 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,15.5 + rot: 1.5707963267948966 rad + pos: 69.5,-9.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Kitchen + id: Reporter's Office - proto: SurveillanceCameraSupply entities: + - uid: 14135 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,10.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Logistics - uid: 17375 components: - type: Transform @@ -101524,6 +102079,26 @@ entities: parent: 2 - type: SurveillanceCamera id: Salvage Dock + - uid: 17968 + components: + - type: Transform + pos: 48.5,14.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Equipment + - uid: 17970 + components: + - type: Transform + pos: 52.5,2.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Shuttle Dock - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 8556 @@ -113855,7 +114430,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1095.1196 + secondsUntilStateChange: -3483.2776 state: Opening - type: Airlock autoClose: False @@ -113871,7 +114446,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1094.553 + secondsUntilStateChange: -3482.711 state: Opening - type: Airlock autoClose: False @@ -113893,7 +114468,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1094.0863 + secondsUntilStateChange: -3482.2444 state: Opening - type: Airlock autoClose: False @@ -113909,7 +114484,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1095.6196 + secondsUntilStateChange: -3483.7776 state: Opening - type: Airlock autoClose: False @@ -113955,11 +114530,26 @@ entities: - type: Transform pos: 2.5,-6.5 parent: 2 + - uid: 9485 + components: + - type: Transform + pos: 37.5,10.5 + parent: 2 - uid: 12145 components: - type: Transform pos: 42.5,-19.5 parent: 2 + - uid: 13238 + components: + - type: Transform + pos: 38.5,10.5 + parent: 2 + - uid: 13239 + components: + - type: Transform + pos: 42.5,9.5 + parent: 2 - uid: 16358 components: - type: Transform From c4d1f9bef499bd0618ad5c2423907734ec7e45ec Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:08:24 -0500 Subject: [PATCH 014/561] Hotfix chibi.yml (#1918) Update chibi.yml --- Resources/Maps/chibi.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Maps/chibi.yml b/Resources/Maps/chibi.yml index af9f8850244..14209b5445a 100644 --- a/Resources/Maps/chibi.yml +++ b/Resources/Maps/chibi.yml @@ -24843,6 +24843,13 @@ entities: - type: Transform pos: -5.5,7.5 parent: 2 +- proto: SpawnPointLatejoin + entities: + - uid: 4312 + components: + - type: Transform + pos: 10.5,9.5 + parent: 2 - proto: SpawnPointLocationMidRoundAntag entities: - uid: 4217 From 3f605dfe7c9a6569eba62b290cd9cee50799eeae Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Fri, 27 Sep 2024 06:35:41 +1000 Subject: [PATCH 015/561] Further Sec Sprite Tweaks (#1901) * Further Sec Sprite Tweaks * Update secdrobe.yml * extra 1984 greatcoats --- .../deltav/preferences/loadout-groups.ftl | 7 +-- .../Catalog/Fills/Lockers/dressers.yml | 2 - .../VendingMachines/Inventories/secdrobe.yml | 1 - .../DeltaV/Entities/Clothing/Head/hats.yml | 11 ++++ .../Clothing/OuterClothing/wintercoats.yml | 49 +++++------------- .../Entities/Clothing/Uniforms/jumpskirts.yml | 46 ++++++++++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 48 +++++++++++++++++ .../Loadouts/Jobs/Security/brigmedic.yml | 17 ++++++ .../DeltaV/Loadouts/loadout_groups.yml | 10 ++++ .../DeltaV/Loadouts/role_loadouts.yml | 4 +- .../Loadouts/Jobs/Security/detective.yml | 20 +++++++ .../Jobs/Security/head_of_security.yml | 9 +--- .../Jobs/Security/security_officer.yml | 5 -- .../Loadouts/Jobs/Security/warden.yml | 15 ++++-- .../Prototypes/Loadouts/loadout_groups.yml | 23 ++++---- .../Prototypes/Loadouts/role_loadouts.yml | 4 +- .../Hats/beret_det.rsi/equipped-HELMET.png | Bin 0 -> 914 bytes .../Clothing/Head/Hats/beret_det.rsi/icon.png | Bin 0 -> 721 bytes .../Head/Hats/beret_det.rsi/inhand-left.png | Bin 0 -> 7354 bytes .../Head/Hats/beret_det.rsi/inhand-right.png | Bin 0 -> 7357 bytes .../Head/Hats/beret_det.rsi/meta.json | 26 ++++++++++ .../equipped-OUTERCLOTHING.png | Bin 2100 -> 2145 bytes .../WinterCoats/armourercoat.rsi/icon.png | Bin 948 -> 957 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 1970 bytes .../WinterCoats/corpsmancoat.rsi/icon.png | Bin 0 -> 988 bytes .../corpsmancoat.rsi/inhand-left.png | Bin 0 -> 898 bytes .../corpsmancoat.rsi/inhand-right.png | Bin 0 -> 905 bytes .../WinterCoats/corpsmancoat.rsi/meta.json | 26 ++++++++++ .../detcoat.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1965 bytes .../WinterCoats/detcoat.rsi/icon.png | Bin 0 -> 1008 bytes .../WinterCoats/detcoat.rsi/inhand-left.png | Bin 0 -> 898 bytes .../WinterCoats/detcoat.rsi/inhand-right.png | Bin 0 -> 905 bytes .../WinterCoats/detcoat.rsi/meta.json | 26 ++++++++++ .../hoscoat.rsi/equipped-OUTERCLOTHING.png | Bin 2089 -> 2268 bytes .../WinterCoats/hoscoat.rsi/icon.png | Bin 964 -> 996 bytes .../staseccoat.rsi/equipped-OUTERCLOTHING.png | Bin 1893 -> 1954 bytes .../WinterCoats/staseccoat.rsi/icon.png | Bin 970 -> 983 bytes .../equipped-OUTERCLOTHING.png | Bin 1477 -> 1481 bytes .../WinterCoats/stasecsweater.rsi/icon.png | Bin 796 -> 800 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1516 bytes .../Jumpskirt/armourer_alt.rsi/icon.png | Bin 0 -> 800 bytes .../armourer_alt.rsi/inhand-left.png | Bin 0 -> 980 bytes .../armourer_alt.rsi/inhand-right.png | Bin 0 -> 948 bytes .../Jumpskirt/armourer_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1508 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1579 bytes .../Jumpskirt/brigmedic_alt.rsi/icon.png | Bin 0 -> 834 bytes .../brigmedic_alt.rsi/inhand-left.png | Bin 0 -> 1012 bytes .../brigmedic_alt.rsi/inhand-right.png | Bin 0 -> 965 bytes .../Jumpskirt/brigmedic_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1548 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1550 bytes .../Jumpskirt/detective_alt.rsi/icon.png | Bin 0 -> 829 bytes .../detective_alt.rsi/inhand-left.png | Bin 0 -> 1006 bytes .../detective_alt.rsi/inhand-right.png | Bin 0 -> 962 bytes .../Jumpskirt/detective_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1500 bytes .../hos_alt.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1566 bytes .../Uniforms/Jumpskirt/hos_alt.rsi/icon.png | Bin 0 -> 830 bytes .../Jumpskirt/hos_alt.rsi/inhand-left.png | Bin 0 -> 996 bytes .../Jumpskirt/hos_alt.rsi/inhand-right.png | Bin 0 -> 966 bytes .../Uniforms/Jumpskirt/hos_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1552 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1612 bytes .../Jumpsuit/armourer_alt.rsi/icon.png | Bin 0 -> 812 bytes .../Jumpsuit/armourer_alt.rsi/inhand-left.png | Bin 0 -> 980 bytes .../armourer_alt.rsi/inhand-right.png | Bin 0 -> 948 bytes .../Jumpsuit/armourer_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1669 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1688 bytes .../Jumpsuit/brigmedic_alt.rsi/icon.png | Bin 0 -> 846 bytes .../brigmedic_alt.rsi/inhand-left.png | Bin 0 -> 1012 bytes .../brigmedic_alt.rsi/inhand-right.png | Bin 0 -> 965 bytes .../Jumpsuit/brigmedic_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1652 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1659 bytes .../Jumpsuit/detective_alt.rsi/icon.png | Bin 0 -> 840 bytes .../detective_alt.rsi/inhand-left.png | Bin 0 -> 1006 bytes .../detective_alt.rsi/inhand-right.png | Bin 0 -> 962 bytes .../Jumpsuit/detective_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1607 bytes .../hos_alt.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1677 bytes .../Uniforms/Jumpsuit/hos_alt.rsi/icon.png | Bin 0 -> 834 bytes .../Jumpsuit/hos_alt.rsi/inhand-left.png | Bin 0 -> 996 bytes .../Jumpsuit/hos_alt.rsi/inhand-right.png | Bin 0 -> 966 bytes .../Uniforms/Jumpsuit/hos_alt.rsi/meta.json | 30 +++++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1766 bytes 87 files changed, 518 insertions(+), 71 deletions(-) create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index ec18b4f7a17..a81350ed0f0 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -85,10 +85,11 @@ loadout-group-head-of-security-shoes = Head of Security shoes loadout-group-security-cadet-head = Security Cadet head loadout-group-security-neck = Security neck -loadout-group-brig-medic-head = Brigmedic head -loadout-group-brig-medic-jumpsuit = Brigmedic jumpsuit -loadout-group-brig-medic-back = Brigmedic backpack +loadout-group-brig-medic-head = Corpsman head +loadout-group-brig-medic-jumpsuit = Corpsman jumpsuit +loadout-group-brig-medic-back = Corpsman backpack loadout-group-brig-medic-neck = Corpsman neck +loadout-group-brig-medic-outerclothing = Corpsman outer clothing loadout-group-prison-guard-head = Prison Guard head loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 6470a0437cb..aab8ad92871 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -76,7 +76,6 @@ - id: ClothingUniformJumpsuitHosFormal # - id: ClothingOuterWinterHoS # DeltaV - removed for incongruence - id: ClothingOuterCoatStasecHoS # DeltaV - add winter coat - - id: ClothingOuterGreatcoatStasecHoS # DeltaV - add greatcoat - id: ClothingShoesBootsWinterHeadOfSecurity # DeltaV - add HoS winter boots - type: entity @@ -120,5 +119,4 @@ - id: ClothingHeadHatWarden - id: ClothingHeadHatBeretWarden - id: ClothingOuterCoatStasecWarden # DeltaV - add winter coat - - id: ClothingOuterGreatcoatStasecWarden # DeltaV - add greatcoat - id: ClothingShoesBootsWinterWarden # DeltaV - add winter boots diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index b19ed1da6c5..178fea40b10 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -26,7 +26,6 @@ ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe ClothingOuterStasecSweater: 2 # DeltaV - add sweaters to secdrobe ClothingOuterCoatStasec: 2 # DeltaV - replace ClothingOuterWinterSec - ClothingOuterGreatcoatStasec: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times. ## ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech ## ClothingOuterArmorBasicSlim: 2 ClothingNeckScarfStripedRed: 3 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index bdb5ad85d9a..3dcda0fd5ee 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -193,6 +193,17 @@ - type: Clothing sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretDet + name: detective's beret + description: For forensic specialists and dogged investigators. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCJToque diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml index fcc8033551b..ce4ee91cfef 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml @@ -73,7 +73,7 @@ parent: ClothingOuterStasecSweater id: ClothingOuterCoatStasecHoS name: head of security's coat - description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. Bears HoS arm flashes. + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is adorned with gold trim. components: - type: Sprite sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi @@ -84,7 +84,7 @@ parent: ClothingOuterStasecSweater id: ClothingOuterCoatStasecWarden name: warden's coat - description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. Sports warden arm flashes. + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version features ice-white trim. components: - type: Sprite sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi @@ -92,44 +92,23 @@ sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi - type: entity - parent: ClothingOuterStorageFoldableBase - id: ClothingOuterGreatcoatStasec - name: station security greatcoat - description: A long and heavy greatcoat, yet to be phased out of use for Station Security. It's hard to tell what's so great about it, but it sure is warm and sturdy. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecgreatcoat.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecgreatcoat.rsi - - type: TemperatureProtection - coolingCoefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.75 - - type: AllowSuitStorage - -- type: entity - parent: ClothingOuterGreatcoatStasec - id: ClothingOuterGreatcoatStasecHoS - name: head of security's greatcoat - description: A long and heavy greatcoat, yet to be phased out of use for Station Security. Bears HoS arm flashes. + parent: ClothingOuterStasecSweater + id: ClothingOuterCoatStasecDet + name: detective's coat + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is detective plum. components: - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hosgreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hosgreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi - type: entity - parent: ClothingOuterGreatcoatStasec - id: ClothingOuterGreatcoatStasecWarden - name: warden's greatcoat - description: A long and heavy greatcoat, yet to be phased out of use for Station Security. Sports warden arm flashes. + parent: ClothingOuterStasecSweater + id: ClothingOuterCoatStasecCorpsman + name: corpsman's coat + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is corpsman blue. components: - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourergreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourergreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 40e5381b843..33077504a70 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -46,6 +46,19 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi +# Corpsman alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtBrigmedicTurtle + name: corpsman's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi + # Detective uniform - type: entity @@ -59,6 +72,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtDetTurtle + name: detective's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi + # Senior Officer uniform - type: entity @@ -96,6 +120,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_grey.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtWardenTurtle + name: warden's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi + # HoS alt uniforms - type: entity @@ -120,6 +155,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtHoSTurtle + name: head of security's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi + # Central Command Uniform - ported from Velta - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 93c3a597d73..31efe29534a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -209,6 +209,19 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformalsuit.rsi +# Corpsman alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitBrigmedicTurtle + name: corpsman's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi + # Detective uniform - type: entity @@ -222,6 +235,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitDetTurtle + name: detective's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi + # Senior Officer uniform - type: entity @@ -259,6 +283,30 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_grey.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitWardenTurtle + name: warden's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi + +# HoS alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitHoSTurtle + name: head of security's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi + # Central Command Uniform - ported from Velta - type: entity diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml index 5b35ab9d1a9..42c7f2c89aa 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml @@ -15,6 +15,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtBrigmedic +- type: loadout + id: BrigMedicTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitBrigmedicTurtle + +- type: loadout + id: BrigMedicTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtBrigmedicTurtle + # Back - type: loadout id: BrigMedicBackpack @@ -30,3 +40,10 @@ id: BrigMedicDuffel equipment: back: ClothingBackpackDuffelBrigmedic + +# OuterClothing + +- type: loadout + id: StasecWinterCoatCorpsman + equipment: + outerClothing: ClothingOuterCoatStasecCorpsman diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 9d35f9e582a..fe14a7a3d8d 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -94,6 +94,16 @@ loadouts: - BrigMedicJumpsuit - BrigMedicJumpskirt + - BrigMedicTurtlesuit + - BrigMedicTurtleskirt + +- type: loadoutGroup + id: BrigMedicOuterClothing + name: loadout-group-brig-medic-outerclothing + loadouts: + - StasecWinterCoatCorpsman + - PlateCarrier + - DuraVest - type: loadoutGroup id: BrigMedicBack diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 0757fb27844..8b9e3988e0a 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -23,9 +23,9 @@ - BrigMedicJumpsuit - BrigMedicBack - SecurityShoes - - SecurityOuterClothing + - BrigMedicOuterClothing - MedicalGloves - - SurvivalSecurity # DeltaV - replace SurvivalCorpsman for incongruence + - SurvivalSecurity - Trinkets - GroupSpeciesBreathToolCorpsman diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index d2cca17d281..cfda9849b83 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -9,6 +9,11 @@ equipment: head: ClothingHeadHatFedoraGrey +- type: loadout # DeltaV + id: DetBeret + equipment: + head: ClothingHeadHatBeretDet + # Neck - type: loadout id: DetectiveTie @@ -46,6 +51,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtForensicSpec +- type: loadout # DeltaV + id: ForensicSpecTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitDetTurtle + +- type: loadout # DeltaV + id: ForensicSpecTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtDetTurtle + # OuterClothing - type: loadout id: DetectiveArmorVest @@ -56,3 +71,8 @@ id: DetectiveCoat equipment: outerClothing: ClothingOuterCoatDetectiveLoadout + +- type: loadout # DeltaV + id: StasecWinterCoatDet + equipment: + outerClothing: ClothingOuterCoatStasecDet diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 6e35e8ca032..9b762ffd3f5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -32,12 +32,12 @@ - type: loadout id: HeadofSecurityTurtleneck equipment: - jumpsuit: ClothingUniformJumpsuitHoSAlt + jumpsuit: ClothingUniformJumpsuitHoSTurtle # DeltaV - replace ClothingUniformJumpsuitHoSAlt - type: loadout id: HeadofSecurityTurtleneckSkirt equipment: - jumpsuit: ClothingUniformJumpskirtHoSAlt + jumpsuit: ClothingUniformJumpskirtHoSTurtle # DeltaV - replace ClothingUniformJumpsuitHoSAlt - type: loadout id: HeadofSecurityFormalSuit @@ -97,11 +97,6 @@ equipment: outerClothing: ClothingOuterCoatStasecHoS -- type: loadout # DeltaV - security greatcoat - id: StasecGreatcoatHoS - equipment: - outerClothing: ClothingOuterGreatcoatStasecHoS - # Shoes - DeltaV - type: loadout # DeltaV id: HeadOfSecurityWinterBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index f55a23e17d6..d2f105fdb13 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -165,11 +165,6 @@ equipment: outerClothing: ClothingOuterCoatStasec -- type: loadout # DeltaV - security greatcoat - id: StasecGreatcoat - equipment: - outerClothing: ClothingOuterGreatcoatStasec - # Shoes - type: loadout id: CombatBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 06cb118ec5d..54f1bb0c210 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -40,6 +40,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtWardenBlue +- type: loadout + id: WardenTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitWardenTurtle # DeltaV + +- type: loadout + id: WardenTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtWardenTurtle # DeltaV + # OuterClothing - type: loadout id: WardenCoat @@ -55,8 +65,3 @@ id: StasecWinterCoatWarden equipment: outerClothing: ClothingOuterCoatStasecWarden - -- type: loadout # DeltaV - security greatcoat - id: StasecGreatcoatWarden - equipment: - outerClothing: ClothingOuterGreatcoatStasecWarden diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index c0d2d2153cd..8bfb6b6484b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1088,8 +1088,8 @@ - HeadofSecurityJumpskirtGrey # DeltaV - HeadofSecurityJumpsuitBlue # DeltaV - HeadofSecurityJumpskirtBlue # DeltaV - - HeadofSecurityTurtleneck # DeltaV - - HeadofSecurityTurtleneckSkirt # DeltaV + - HeadofSecurityTurtleneck + - HeadofSecurityTurtleneckSkirt - HeadofSecurityFormalSuit - HeadofSecurityFormalSkirt # - HeadofSecurityParadeSuit # DeltaV - removed for incongruence @@ -1113,7 +1113,6 @@ - PlateCarrier # DeltaV - DuraVest # DeltaV - StasecWinterCoatHoS # DeltaV - - StasecGreatcoatHoS # DeltaV - type: loadoutGroup # DeltaV id: HeadofSecurityShoes @@ -1142,6 +1141,8 @@ - WardenJumpskirtGrey # DeltaV - WardenJumpsuitBlue # DeltaV - WardenJumpskirtBlue # DeltaV + - WardenTurtlesuit # DeltaV + - WardenTurtleskirt # DeltaV - type: loadoutGroup id: WardenOuterClothing @@ -1152,7 +1153,6 @@ - PlateCarrier # DeltaV - DuraVest # DeltaV - StasecWinterCoatWarden # DeltaV - - StasecGreatcoatWarden # DeltaV - type: loadoutGroup id: SecurityHead @@ -1205,7 +1205,6 @@ # - SecurityOfficerWintercoat - removed for incongruence - StasecSweater # DeltaV - StasecWinterCoat # DeltaV - - StasecGreatcoat # DeltaV - type: loadoutGroup id: SecurityShoes @@ -1233,8 +1232,9 @@ name: loadout-group-detective-head minLimit: 0 loadouts: - - DetectiveFedora - - DetectiveFedoraGrey +# - DetectiveFedora # DeltaV - removed for incongruence +# - DetectiveFedoraGrey # DeltaV - removed for incongruence + - DetBeret # DeltaV - type: loadoutGroup id: DetectiveNeck @@ -1254,14 +1254,19 @@ # - NoirJumpskirt # DeltaV - removed for incongruence - ForensicSpecJumpsuit # DeltaV - ForensicSpecJumpskirt # DeltaV + - ForensicSpecTurtlesuit # DeltaV + - ForensicSpecTurtleskirt # DeltaV - type: loadoutGroup id: DetectiveOuterClothing name: loadout-group-detective-outerclothing minLimit: 0 loadouts: - - DetectiveArmorVest - - DetectiveCoat +# - DetectiveArmorVest # DeltaV - removed for incongruence +# - DetectiveCoat # DeltaV - removed for incongruence + - StasecWinterCoatDet # DeltaV + - PlateCarrier # DeltaV + - DuraVest # DeltaV - type: loadoutGroup id: SecurityCadetJumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 8181b634335..7f6b5a81b1f 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -406,11 +406,11 @@ id: JobDetective groups: - GroupTankHarness - - SecurityHead # DeltaV - replace DetectiveHead for incongruence + - DetectiveHead - SecurityNeck # DeltaV - replace DetectiveNeck for incongruence - DetectiveJumpsuit - SecurityBackpack - - SecurityOuterClothing # DeltaV - replace DetectiveOuterClothing for incongruence + - DetectiveOuterClothing - SecurityShoes - SurvivalSecurity - Trinkets diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..48c56cd67500edb568a853a349afb9316017cd3c GIT binary patch literal 914 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Y-ueVd6 z#IgFimRbouR~HeB2o^~XN0T;3y=x2DB6X`iD+lbpv)W|~n=Y@D^OZ~2FVqKQUx*T5 zaTU0Do5uO~a_{Qg&Qt}^aiCEtz1mb&>?%oFrQdOb8=#CGUc#jf9Sv3ar} zo6xM4=iSniOl0G~-w4?&9lCec``_gyYnJ%%=Bzy=JS$J6b$QF-*RHW2`wF&C^IgLs z&-t6za>0kKmnMhS132OWciDyyPjFI zoEMuDe|75)ZT!d*?mhIsaDgir2SV@3fpW zU$9Cm{r;RY$4#=H9sAh#EVAKkd8}_aZe-Na|*CfE=&?FSB`!7yt zTF99S3z<8M6WIT=zYvQEZko9zt<(Bzb@f}-WCMns65l!gxIWgelu}{E<4BOxlZ1Y- Zeyv*?D3Ch$H!!9dJYD@<);T3K0RZ8fmu>(6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf993c708f64cd64e2f9652fcf76ed10eaa61a3 GIT binary patch literal 721 zcmV;?0xtcDP)C&{_}#MG(>0+}9FudyfiA!LUe0+A*uyz3Z#n~zFBFYPDCk{?FM3_C zw9$i;5e5>Psn14dVl*9J_t;du8&$oU@B4RjtfWj0Y^}l*nr;+@r-Z}nMP2cZaJQCC ztOy?o`wcmu@U_yDRen*Nsq%+nBNmwkyXxu9G;p$kwXBgB9v1fHb0w{I9(5CUsxTjw z+9$IglL#S#cu7)Xl^jJzr4}T!|9ydqZ;mzbX!6(Dzz|1qnr)*i@$CmYT0*)uREY$sLlGEg;=;gZRI|R=boL|+o zw_sEdK%(W@r?^ zZz!$+000SaNLh0L01FZT01FZU(%pXi00039NklR1_!4QHObt54OA6n8Xk!_^tHI8gxU{Y)?D4Q{>+_kewWTJC?vS8k&7j|sB`Dun>Qg~1^Fp{ zRMN`A)KxcfsmPULu{tTOrIeecyQh<+C?aaEXSJwU!%)fNs{4L3bG`FjuHe;D=boAQ z{@&+(p7(vf?{J2vQzuP`KzAU9VIoqJ6DPwvp4{PK@T~LXe$FucvOVL+r+PGvVMZ>? zU)K2BaSsmOURGLBGPr+IVw5~JbVzanzbIi$%gbTuql>$SrEWg>x5SNMqa((R-?Mw) zXJx5#KARR9niRRK_29k%xsNYJ6OX>T=Ir^xokcTt7WHr4ri{-1)lJWjje0J5WP8R_ zV~aE1+_-Duirc~lRK4DG-y;tG?wQ@KX^nSIX{`G8Y(ZZA+WR9i*MB&$>anONYb&;W zlaz6yGUxBBepeqp^p>*`%FCS%yH`vpeQ?d|-z|0wi+&+&^VeT}%ICa2zoCBFpqS{> z$L0=SKQAVKU_l)_bY3dt0lJeGd_wI`57`pZOj_y$xLT-1@j@p_%@(swqEjh{Qa~bB=f#mMTRIM2d`Do5d znwmFREwJVMG289QblLKXa$Gi7p~uZ2@yqigpo;4pESJjukmk5G5!q7j{BC+zyAs&2ccUh&&k)BrNbw%<@i1 z0fx0ugou|VRRTi+ODgXYcoE(Jh%p#(9Cl+Dt71)(u?jT{hN6==6QQz5U(`gG1aX#R zL_7c+P)&GX)tI=rTxa5g0SJfANj4G)eB6Wv2MOaLRODtkr?FEc5%S9sCJ;ysmhqy9 zRe|GqUi9N(%n>RwlAt~$7OR|_b4&Wgxg=oAxpZF==Z3ma$PZeigxsWbIH%zN-dKWI zN<0$nlFT`YATn?8urdJ}5L<{GCn^#P(i8}S3z(TqAuJrY6o3)Y3@HI2#*YdjF@#Hx zq-2|iaRYmp#2f%1861?$Md4%>(nG283Y4H7wuK;& ztpOz=%DS-#HAWd2>jlN%9U{r>+n;G3fU6*gE+`CM-y%?c0lf00_!ZcaP;L+tt4Mp# z^$={IEM6mKq7+z|H-BKEN03xLY<1(@5DZ3E5BeS_i-C`zGa&|KQ$zSk5CWgM2vqrG zc|n|Dq~}pmV2co0f*wc6732$Za2CPdbCT0p;EmH6`Hp8&&E)6Xar&Oq0m=U7$!_D} zOk+VLh=MGW^9jO1cBolL)HWsOljPmLMxFVN6EIY;3(Hu8P37IVFouFPxYT-dDGycy zt9KAc@zv)nmEEg;B98(Ka7H1hYx7X`X*P~kGOnBVIQXq>jTpk2?QLA```QEf&dR{t zuRWu{Jba_QFzQQ;4}`RO0iqZ7)%$UPf)hh?{Bao3K7#34&ZA(=06HLRDJ1ubq#)=zHk7aAGQP>(|UeChBRcY4d_KY!V^|Dh!{Q%_c(E6vs_)b?>N zG=H^m#zQ*^HFqDALHZ`1XK0W7&)A3T?`G0?&)jj>`q62p|o(h@S zeQ5u}+%2Cd75lTgb6@n7VCIgjg3b?zzk);CgqZ46OOGdKhsCF?c6n+WZ|clFw5P26 zz|RU6|2(wwrLOQtKllZcKlS5;*Uq=^d3ZVs3AdFq@aWtf@|#!F%7;WQ?eB#DjxZ@n MlM>$;H*3NF0oiV}?f?J) literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..921befb3ff633ad471352927f0b23da0a8239c07 GIT binary patch literal 7357 zcmd5>2~ZSQ8g7tKq**K%3GoVyNp?de9zE~%sa9pV6ml4}bT`PN_FOtLWB^BjEQ+YP zbVEQBlMu^9lV}C6WYq*hnWdyw*Gfqsc(7>9ZfVqwi3E*H?V@J?*FEF(8%A(6QG2Sp z-}Qh0_x=C>UQx|US(7Klu)|n}VPY~f(x$@ucjS(WglDa@@HoSSxt*!0Sx&2!VUnsB zRPTN~Wy+Af<%^du8Zt0FElz$qVrWJ(|9tY8!|z09kAC*T16d8nHmB{3937LAdhp95 zE#+BxEi(p1qz`IsKXxRx@K3L>kDaVv+jFI)xpZc8>A?0TWwd+TfU2=^FJ~m3$$fF` zv$@-Mwk})!>&V!e55AZ<$HLz?tGj*L?%~sS*L3z2d$zpyM2u_ep20QG#67oZdDGeS z+^))kPu4uSB`Wdmo*3nwA9j7YdivriYd<*ug5`nuHzOOq{r3UB;4c-swp8Dn5dWWV z=Kp5v!h{8bi)*>W*E$~Bk+?c)!EY!Ogks!9PTmIE&SIeSN7NY)?Az)Uinbn zsDqdDR<)hnbmp5+PmPcGB7W_xL%U8U{Lz)#`R+O{_MZJC+ty8PIy%&|cm3J;j@N6m z4;@w(Eot94p*7~a#Kx-cx<~yKeve~rT%$W_8)V?_f{g6>3==(=++j@3+98mSHc$G~ zo~dfFsi4U1aJuX!PicYOWG`_#7?wO)6SdT^08$C)`^ zdukoh)GjkU&R(5BFo9tSx#5yEXh89eoAq&6rCnwfS^_k^eO9)5CoJ@Y;`M-J7$@L9 zAg?1#7$F$<+Ovwcfr)3BFnbrOUU{M-OGarH?|R)mJjpt^S@OV=hRvD1ECTzy1ktkz zum~e$$KVT|Nc+JE##qH1ixqg0Dd3NJXp;*jFaafUAQ+T1pG24<7wi7?j0ti+BWQY^ z1s*HIlBb?t6B1d06J^mM@o;0UMSNqR254C35g`pRxSBl8%f43UF^0J}JgAqF`~rrB zhvoyxvczI5c1RFP(JW%oA_@|ZI1!10C_!P_u?^zkuvjb(gkW3|c`_nMSm14#<86=v z3~QkXSzeY@2@C}+sk~j_MR)@s#$bdHc3?ZFVyh%$6>1g?MH_J@LS>P@Xcg@egj14P z;sMxzYQh7n`oz`c8WTSZKv* zk-g^H?vE}D5+Gor4TO1(h!`zq5a{6Wz)?GOjPR@;oj`m)yw9jVcmUGt!-(D=I9Qlr zi&M;5Z(Mw_Pz70lx`6OHM5{zfPYW(_g9R<-007BAP%c-6lU1x1N|jfj1kJE51c7V~ zC<#&4j76w1%0OQ)D1q)+lFa`7dCh}x6$H@^g~4lE1j;XnSDqBV0$UQw4Ps&xY3{uq zg6)^ZTZx${1sCSaA6RG+B$W?aT|YMjosrRlw#Uh0;3H^EhymHu5PlMb;Abuis{FEi zAT}`4@+c{=MTjgxizDQU9M1^OBG`L2ayknxJC?B(HkEJV!WbK>!L`=2*YaRA zFnR}p6kl!5P}zOzC-Nw;AZHW{b?rS={hIY-m5giVy$*gOTRnzwX8Rg9`@Z!+{I1m45AB_4F;|C$FK7iK`W8cTx;2bwpMCcN7=Csy51V%LbkQmWoZUTrlrF$VUqD|>uKR|tn2?>Z^+*hw3MtzymbG?ABUrawh^z`-j zdNI0wQ+g!;-KdyeK=iJ^yft_AAQ!D`^mPm4W;Aetju3`dQ9qw zeTz#swK>J6x87FA#~z>QYCgSV`0>u}Q$_U|r|p9-!p9TRh({JGtse3L2B}`yVE{ z3yWsYx^mi8@fEvfWiKrTX_u-SJ&E}jk!|=_3B@_i^{#jGvi_>n4#?{$ENR$0VYltV z(K9FRdh}POoR*J^Z1RYKj%j88T>0?MTHB?kK0a1HWcG-Ok7RmW`BRoQf1T2E(7h!7 z{<&Qh5v?0mw9JcM7hcu4!n8<9iN4Y>ui59dF*^DZ6S056D(k>;74Q!dCNq6<+P0M0 GOaBk-jk3r9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json new file mode 100644 index 00000000000..0b2e116c645 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/equipped-OUTERCLOTHING.png index 020cba2a873b1e02808b44a4605762d28684afed..4353e774c00b51395ba92494f48b78db56037716 100644 GIT binary patch delta 2132 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 KMNUMnLSTYUZUdkI delta 2087 zcmV+?2-x@G5VR1GB!6ycLqkw$V`BgSD3NuMy-Pw-7{-68QIz3OLqvpwMT3PDL}M7_ zVhw80*P_?2z>mwlN=R$a(jYWMEqx9B2ek&R1wl{*5sl4#Eg`q}sGx+N%en85=bY!| zoacZon9;JP!w1=1!3YKX?v>Rwch@@(M(D-MWK=Wt#qdIewtwU2kq%WKCRDHX`&y3P zc*4}6qg!}J(~W}goN#cfpex=J9?;U!xbTUv*N_7W-zq&;<2S{r8hNlhaeR?oK~+zFOAjD0J;ZrEFQhrg$|8L1bH==nf8#U`+PAHvRxo2xu@%#y`ve000SaNPk�XT000XT0n*)m`~Uz3 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�XT000XT0n*)m`~Uy} z>`6pHR9Fe^l|4@aK@f%qV_}TYg5&}P&Bd6|QAuMc_yaVST2Na^Cxw<4+FEF7Lt;%q zL4p+>iIM9JhG1i14q|)Wv*!{*gj-B3j5o<%fuY z^IJs*aO{hlri{m9>G%7__Znp&m&+;eL?WR;0Rt4#;E=%|kH>}mrh$brCDolyM@prV zN;PM=Yb!NNn3ynPMK6h0qKTDFg7q zU@!$|@-cA*5)1^tCd?TVSzom2p?T-&W2WAgYUmYb+kRCuIG#vg_WhDX{gy;cB(Aa?E|5edHB1%D%VxzGc zzxprGkpZGVzw^3MJzJ@#^qrB8G7x3pe-~%q6E|f2Zp!Vbe*gdg07*qoM6N<$f^-MB AdH?_b diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1d8343408d3bc4b768cc7973428c9b3be27455e0 GIT binary patch literal 1970 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 KMNUMnLSTZl=Eo-h literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..40b2530a17f75b1b3e191173223ce9d314015552 GIT binary patch literal 898 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd6 z#IgF7fm0p^IJ>koyEeCqxFkzFN#f1AaDCDB^#}S-@AdM?zHmvw#6`E3_b>ZawzaH| z0W5;OXKQs8w|`%;pk?0ao$vdf&w2iI&hrM{85cJ#JIsDF<{$^_pLbKQnwDR;=5u>- z^mIyy@zeR9-D){kPvyefKI3U0JX=y29;pZ_|f41qG`YXx|f-yKw2^ zjt`w1u1{d*y02v$_SpRBN~wBHGo^)<8&=MH7b1LoR)n{7&P#J5_b;CoYRUYYJLb96zdcV(e(P54Tv*w6 za4Yk4b6(vthVb16Ki0VSW`u4!y+w8MheF2M)fejdZC`I)^Xl~+d&iXMc`x|*`V)M< z?KbQK$!8;-MT-(=-B1y;uuoF_;%Joufq-kZR(E< zBR-~SR7?)AX}57dkp4l}=7-q62J!d<>>sXdo)On7a9;4El<`sCr5oPnZDtAH=XCS! zyC?H+=BHmi+{Yo$;lRKo(7?c=z`%&kw3u_?_37a3d3AMr-v3TJvz&Kj>gVdL*%m1^ zcJsH-m)E{{VC&vJUarSit?H`zsuOi7^QYI_E#LXhEL+By9=UB^U3L7)vr2D$r=MQR z_U=t~d)SxdSF`!wvYc)(@m;FpJ@ahZr_X;?xgI|H<1=fS;M~tQcTR|MX0)_jpMH1F z_17gApHf7|0Woe9ew+c zo#EVowR$#v$tz!1@g{cUdFV#VI2tE>ew+V~b<5tp)gQhkU+l8dy&Wadj@7S-5IF98 z;Ev}jt=RYS=AA6NW$%f|u3lf>?)+MC&-yjTqVCw)@A@I|m1FYRhLcwX-rNqHU)e6j z^t`I&q#Pr2P6n^zhhGfBHzM9%kZSTwZ&=#)U_n*OMl&9JfgkBCb&QWf7@~P&SJwff Omci52&t;ucLK6V~^pY-ueVd6 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8346b09e7e0e19aa0952ff44f88008758dca433a GIT binary patch literal 1008 zcmV$C*1j5%^^OrD5@(scA7|!VX3l^wk~a!YV*m=KYe&N&ZDDaqYks1Y zUSN!%ZaCI#Y$ndXLzu3sy1>q6l!9u=d{G3PKq$6d{$E5bl z9Kaz;m=GEXO617nN-jA}$*jIF@a>zUC>}%p7G-R4WXOtlRMe7mO-W6Qo{}$5S>^sW zPbVE5uXgVULDPfhy$nI~7JODb@8iJpJ`cfv4`*i0UzD6C-$bv}w81^-T8ESKnwHpx z(+%jmvvgbkmi#h(=`=haL+2uNUqRb)HLIU>j&32oCQoz;JG(F}`@2@Y06>mtD7n2E z#{d8T32;bRa{vGf5&!@T5&_cPe*6Fc0x3yEK~z`??NvQXBT*DRQ6V5EMX-q3V2}hE zw00`j+CLx*sr&+MEyQA3@dIou+;&k`D+{x1xoe>ysGzZMi&aJtG`k^!l}!9fHO_hP zhCvdzUXju3%2uXq?ea5*S)RYN)%5_;=OZx)EO~MV%b>;;jp+q2?&06i*oH+N# z{BMT@1F~|)Y0P83a1JN7`<>5yFB%C%qfz8@I+l;NkxHddDwUAQWS)$bN(BR*9|eh8t%h>B z?0f!;2?Qr#JRXN(7y{gmIfVZn8|XKVQRvB|t@)mSAPG&=U{^2Zek6Q*fZ+Ve${loj za(iuJMeD%Ly|2tGhSvskA2nf{x98M=Ta|I9{38kQcxTTWv>H$~muzHu<$6#%i@Hz8S*t zcz7~TKt8?0!?^df&*5^0~^1tWJeQ5b)P17VZfZ e2o-p91s(u(XB(2xt!IG%0000Y-ueVd6 z#IgF7fm0p^IJ>koyEeCqxFkzFN#f1AaDCDB^#}S-@AdM?zHmvw#6`E3_b>ZawzaH| z0W5;OXKQs8w|`%;pk?0ao$vdf&w2iI&hrM{85cJ#JIsDF<{$^_pLbKQnwDR;=5u>- z^mIyy@zeR9-D){kPvyefKI3U0JX=y29;pZ_|f41qG`YXx|f-yKw2^ zjt`w1u1{d*y02v$_SpRBN~wBHGo^)<8&=MH7b1LoR)n{7&P#J5_b;CoYRUYYJLb96zdcV(e(P54Tv*w6 za4Yk4b6(vthVb16Ki0VSW`u4!y+w8MheF2M)fejdZC`I)^Xl~+d&iXMc`x|*`V)M< z?KbQK$!8;-MT-(=-B1y;uuoF_;%Joufq-kZR(E< zBR-~SR7?)AX}57dkp4l}=7-q62J!d<>>sXdo)On7a9;4El<`sCr5oPnZDtAH=XCS! zyC?H+=BHmi+{Yo$;lRKo(7?c=z`%&kw3u_?_37a3d3AMr-v3TJvz&Kj>gVdL*%m1^ zcJsH-m)E{{VC&vJUarSit?H`zsuOi7^QYI_E#LXhEL+By9=UB^U3L7)vr2D$r=MQR z_U=t~d)SxdSF`!wvYc)(@m;FpJ@ahZr_X;?xgI|H<1=fS;M~tQcTR|MX0)_jpMH1F z_17gApHf7|0Woe9ew+c zo#EVowR$#v$tz!1@g{cUdFV#VI2tE>ew+V~b<5tp)gQhkU+l8dy&Wadj@7S-5IF98 z;Ev}jt=RYS=AA6NW$%f|u3lf>?)+MC&-yjTqVCw)@A@I|m1FYRhLcwX-rNqHU)e6j z^t`I&q#Pr2P6n^zhhGfBHzM9%kZSTwZ&=#)U_n*OMl&9JfgkBCb&QWf7@~P&SJwff Omci52&t;ucLK6V~^pY-ueVd6 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�XT000XT0n*)m`~Uz3 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�XT000XT0n*)m`~Uy} z{7FPXR9Fe^mA^~FKorMc#X-at5wWF&R_Kz73ND?T9JGIelOPEG0d9gI2yXrXg5WAB z&I+zBSp%NIS5PgCA>Qe$v4=`dhA8}JNBA`JyJ>VE4Yru({nh^o6 zT|iJ_Yh_;5mytDo;-+TQ18lDUkfL9Rz9)`%4$h4CGbNnmX9{Er{67Ug0NC8{9-u?I Q8UO$Q07*qoM6N<$f@fC3kpKVy diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/equipped-OUTERCLOTHING.png index 9932b8893431daf5723b124b65ca57771b8c65de..8f98501808c0eed96babbcd3a51e332d231524e7 100644 GIT binary patch delta 1940 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�XT000XT0n*)m`~Uz2 zok>JNRCodHnn7qJMHGf>79}dls6;n0j+-3=GFgQjlz0&jp7uN_h{q^+RZwp(i+a+7 zUKiA(2!TE4Feeegpof5N1|cTVI0oH-&J1c;u&u9VUR&GtOzO4M%4$8xR(DnR`(OR_ z-mBSuWq(YR$UtNuG7uSv3`7S0uMAXfw26Pb@j>$ae%su$*f81lvGdQU=W|L!0O0GF zE+n;DE%D#uo_@yt{z+etn>=I`!M{mkq%i*Wt83=P*WXVL4h||zo_kpljXv$OPe1pH zdu3*3#_(s%hP&_e)=jV1)2egN2fNJN++4D_xPNF~e)fDiSxbWPC;!%a8_tmJ?d@Q_ zp;iliwOTdZZr9L?$UQAYXz+tPU}(b16#f20Snt$q0Jn=a{Hd}+;1 zet&;I1>@qEe%E|)rS1N>XB-lEo@B}U=wVDN@*a8w|M2ioh;{0Y9zJcRZe=$Zcmm@- zKK-JH>pU4rfFw6*t$SD41w>fk+olI$Kqx@O{QNv&QjzUaT6ss)g6r=v=taL||9?H} zc}V@Pf%i4;yZJBp^8Ps7ks*NbWcI;+J5cdcw{L1gZG#+OQiIOe0m1~i@Xoqx$=VoE zMDp-)?_ZCvrRp9!HwZN$g>giKugcQIB=IePl6?WS8Q;bKBr-qx@+6Co*Fk~^Nmz?N zG6Y1a-x6Q4%Jh>2MM!>(mnlB}Fn`IWIf2O+!B-I=lLQ?0B?)p5IOAms`d5d$Ko*Do zBKYbM@PUbM@`Nv17xdpf>6#GW8IrFEi{OhEKbQcv6WI|?YM*-kwP3xz@#C(`!dDp@ zVni8}7h?Wxe6b_8k%7oSWFRsS8Hfx-1|kEIfyh8)ATkgcxWO4veGg!+d4K;WFY_C~ zIDRK#i|U&o#^iks!VvjfHO}Bkje(Und2G{)+5_a%w0xD#mdmx@32bAOy zKGpNZT8ppp0KobB3mAWVg{24~6`-O;5Df|b zm)1W?Nzi~7c~(LYOt2Ab!G9*H3~BTRhXBk@O-;Gl`|m%0Y5M)Xk$SxtL80WU_LX3r z8bjsT2O8%RIg=o`oC%;Te(LrIU1|RK_&7Kef;~XK#Z#+i@(8Xc!Zn7KE&iDVu*3#z zl5+`SYltnu1fY!iJFCt~5n7vY(okR=4=8d{i+4i=-RYSGTNTFjv46q02^%#svO1in zM3N0-fcy9KWvevwO;Zv8#C8^7^68}U3l!<@^CfL{@{l0C|cT%e+fP@1Oz;{&bnLuj@ zeXI&OqHF;JEHJ^whT%dak_}H6LV~{&$ZvDnBIoss5OLD6`OwK1!H(}l1|kEIfyh8);6KE`A49&&3a(0; Qb^rhX07*qoM6N<$f}}o}4*&oF diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/icon.png index f504fd0c7c926994a0479eb4ef51989b008c802d..d1746a61db6853981986cc5a8cd456fa7b5dce0f 100644 GIT binary patch delta 961 zcmV;y13vu92iFIXB!6vbLqkw$V`BgSD3NuMJ4*vW6oo$%#Wxm;h*)f)VxbTWh^0g@ zO|(cN_-ZzrCnTF?cY_35!NwwBA=>yV{0G_!whDrv2qKo&z8aDBju9dfXPLbpXXadH z&VVnHHwsQ;01BpSN5dg)VR1=oexj9LV2q${IM!@zCeFX({eOlARjL zzu3sy1>q6l!9u=d{G3PKq$6d{$E5bl9Kaz;m=GEXO617nN-jA}$*jIF@a>zUC>}%p z7G-R4WXOtlRDaZxbWKT3i=L7%Pg&*uH%})W9Itlo2tm_>=e-O;^A>zoJn!Sc^F9y3 ze-CG7&0mz9Cf`J_)U?4p=vs%9^O}~}hSLq`yR&p#|CanRed#njA4BINbYDT+ay6@; zb&hT!z9vs}2|K$mEc?4wz5qauXehb88OHzs010qNS$}f?01FZT01FZU(%pXi0006I zNklt;dk3b_AMeHj=9k_8W>h+ZE1#h5m=$a4!>U!E}(a4+*;T;W=Y&d zxRb*VoS!0u3P>iCR(wQZapzX|oFZW0ox=_R4tS;r+(KR$P#j52ky$z+X>fw>@56K2OS-Djw@dsQn6U{j4#9hg1&Vm2!BEQyDDT{9HNwTg~MT|5l}9FY3ML+E4)+eHSO~p$gdX|s#>kG zGs6i`XVb8mwlN=R$a(jYWMEqx9B2ek&R1wl{*5sl4#Eg`q}sGx+N%en85=bY!| zoacZon9;JP!w1=1!3YKX?v>Rwch@@(M(D-MWK=Wt#qdIewtwU2kq%WKCRDHX`&y3P zc*4}6qg!}J(~W}goN#cfpex=J9?;U!xbTUv*N_7W-zq&;<2S{r8hNlhaeR?oK~+zFOAjD0J;ZrEFQhrg$|8L1bH==nf8#U`+PAHvRxo2xu@%#y`ve000SaNPk�XT000XT0n*)m`~Uy~ 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 N002ovPDHLkV1g?5uJHf> diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png index ccec2493f64ef94c1e0a186d0a6f8d8d96578283..de10ebafd2da06fced3c66053dfa51e81693a471 100644 GIT binary patch delta 755 zcmV9aY<`_ zqLp4?jG%5f)@*Dh&cEaRh6Yuy$5gNX_thQk$&_P2LyPc)VSm}K@RV?5)wL9F3ilXU zJt@2|JZj4Ug)fwzsPd!YOqE|1+wtf$_*73V^NSO|*vQ%i;Su4%LcV1DoJZZHBW2FV zr1r}kz#&SQ5E=j&32oCQoz;JG(F}`@2@Y06>mt zD7n2E#{d8T32;bRa{vGf5&!@T5&_cPe*6Fc0a-~zL4QW@ry|+10$G8qz<*Sr zu4}93Uhj1+74K63T_@4)-J{eZcABOga@+%poIaC^HxB@!s;YcHW8UQc_~PQTh5vd# z3u`Xv2Y*Wuvwp)M=9{LmZQF`5#xKMm?YhqUbq)AfKV3`8g=WRWvn-#lQkJC@Md6oj zf_PaLzvg)s;>U4J_D?DRQjq@~j^dlU0kl1xPV(`6@I#>v9Ea7oYjJc!C$V+Ey}#Ko z3<9ZPP+@IQ07e`z?mfNB~RefK@(UeSi2GleNkAE7D>kE$yPp|uq;%(t} zBdaBakAw$YIiT>h()AL*D9)7lL$RBPPe4fZjAZ_>{)dgMYYF!Y_gH4m_&txhNps4c zpOe}tvkQ+nQ^bg%lVcSVpFyd%WLDW1E&66z6OSQ(hdi!0GGxU&AZkv!rlh7tPswMJ zSGoVs(@T#Gmw&o9$DsZ>2;O@kybFb$AoxBGg2D;ZKEb73_OD4!W1ph$l(n8iXx)VK ztFor=!NnGIJUW`I6{T94p>!JF&Y)!x+HRq7xs=uKI;Rhi*pMf>f&ByMll`qLKPK#G z97cS)#sB~S32;bRa{vGf5&!@T5&_cPe*6Fc0aZyvL4QGN|^@04d0eq7Yx)HK6TyI?311y>AM6;MlCjZTZm-oy6At_I|Q) z90gLtph9R+07e`z?m@~h3{j4x0+g1o`x-fj8E6NNcMwn6t_JY2b!SoR&qfgD}AF`VyiIkT@j5SvLXlaN=usbshTA2SSkE`ERIW^!JhypZBal hRv;^o75Ebh`~og8s?4@H1JVEh002ovPDHLkV1j@1a`FHG diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3025c1090207da8abf9648fdb5cce3666c2886f0 GIT binary patch literal 1516 zcmV?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zTe&T+lln^||& zkau96zxzJV`|LZj=gc~1$rLaJOaW8C6fgx$f&Wy2NB^SV3kwU`#l^*d`t!L1Rsm7yK1N`Xd$gQrfx?Zn$17~V# z%I)p#x#i_$cYb~zZTE(u5e-e@M-k;oOYIT-2F*MTuBst9FccI*e8flWVp4l5{@5u{ z1TO-Ibx24k?hE^>mW%kWkB_~nH;0El|Iust98s#^j}-vxIEC?Uw|gV}A@XbD<+Xms z*O@~65AC)${XPHt>f2QShx}6TC(DSUeyi2;A+69V8h@7)n*9CQ3&0o>W4JF**=?r6 zD11$UPcJg}bmF;lmtFVM&E`D6f|-OrHUdyKoYM+5kM#EsV?+vv8BbdssfdqF+CFwV z-u$!6FTVby*LOY@zf^$y)#CQ|_uaI7)FeWJ^8Kx&rStM8^ZWHp@Doa`r88Zw&jMOqamHYUyv9z?59UL6^{PgtnTAlvN z#v^Xj520cBVACIA=Gu^?2mpXE({*-s=4NMEeERQx@+N)+iE$J7rEdWNlLNlExagfl z0GyTcntRmqlrIXbc=U@Z@zgrX6Y8;6OcPDke_>NDNCNG_0@gwzv655`2?TM~Xff z5*Ut#&gx(^Y}44L^7r}Cxc??00H}(e6amA|10;a*fKy{dVJQ!RhH(u0i{+#U*xK4+ z4tg8pD=RBL8mg*aBokW?@ema<45H&dfMyj>;5a0@X2Fzb8|Dvc2WfBfK;!) zyZ$}^&+6t79RUE}=l20}zHSatZvm-3ZiS_v=wN(O97YUoibM1i2nlEk$YJuZT;-pV z2n`0|FD!VdT$Mw#03ygL3|KKiCS~<4-k(x`2pm%Q+E`P-6fgx$0aM_CD)0yP-wv(> S?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT4jsqw=d%5Zbmr)jGyouN+fttAv~Al%nCE#^*EOYSO7lF6^NJ3lTi^Ey>q^#j zC9J;hMY*4^658P3b#BLFp9@8tz4z1iWdTjon50O)EXxD^@3$M>U*3$L_fZ7mBqE~e zNVXr8Qc)BXh9Tj;&w>J{X`-?$>FA!aEEDAx9bzyHViZNDTe}E=!yd;`HGs%_c?Ap( z%|i$cKwh@rJ}>!J6~GD6u`OrY-uu&UJVHs5?3fAYVHm#H*w+H8X8=Qp{~Q`a#~RlF zTk{B^*jH`EeBWFIG<@vW=2Oi8K)S9o3;+lnLr?_#zbQg>1pvbf2f(ucT>AW;W1a07 ea18u!20j49+^ovytQb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFOi(^Oy8T%-vmC>YwbwWK%t^GUwwn7T$L#V8@2krUEsyWp z{`Jkr|F8D*2)bQ}oVN00O3?px*H_egUn)CMYtV2uE%^Pfr$vG7haaA7 zmtXqj`StB~^UrggXJq`md!3mr3*X+`x80{#e%S1&8D_b5^_8&H$W<>(qS&)+cHVzq z`oT3Y;rrFBt*>HN`{!@J{WWXG*Vx+{O-8kXHg)UX?t7eYB=*GL>W;wKyiLba zZ*8kw_t@?DmUU%zpBJSth#gsXvNd+!pG(K?9KU9~E5{Q@=)gnml5#`xmu0h9?mzzV zMQOdwyH$z~Yn%96GSr=uCr)|ZwyBL_`ALh(CAQOjxEgrwIhYFw?6GurdCjD_!|s5N zUE1p)=Lf-)8SYO$#b9wK+_|BNXa1~~C%`z?`)Q@{H1_hpg&%(ON69B}_g~$9|K|kL s$!8f@PD?dS&|S{UIe~#Qf~Ah}izI7>Qb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFcaquwxH0fDYl-I ze%IXp-n9C))y}x}lWonaqtB&An(g?qZ}y`rKNUDsd@t`0XjgP_JS?Txv+@3xjZY=4 zzW%Iwf9W^FgBrX0bF*)U%~~cX5$JqBRnuNRzG!C*%WH$4zt!2RD*NKHf83iRmA6pW zHPA!EwcP!xXN&M0d%6CK-;Zt=x$r^YS+@$oss;&u6+@;gfV|4(WA zBeQpYG0S0rS>KA!(A}a ze|ch7`r*netTWOlb^w##fh+%wj9ZvzDZ5zh(K&rmG9_tZ)1jx%dk-WryxNl%b5Wbc zclO~G>jmUqG5a{B?Pa(&{mFgb>S}5KLqBI)%zw=~@8^=wn;Bj_`}q8U_uhuA`fKM` z@f+}G-;1p-zPtS6B94aS4yMZoZLf3Bh_X~;6jERmk`VmC`bJQ?;^66TPl2g{!PC{x JWt~$(69D7!wfg`7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..32a79d8054be85839e8baa8db24981e97dc114c1 GIT binary patch literal 1508 zcmV?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT$t*E>lh zbK&lpfA@Uf`RBfucZBpeRrjC<^?i3d}sjxK~zIhL@L@BkBta3-0vv zv{o#SMqVNci;IiHy}i9577{vbdxV?XLxe-{1g(?0c%?dzRt@l@qa(MqwdDqb!5Gf` z{Jc9jIB@Ih>+a&>BHHhmqgxts;YShWPD|}u_>G#m8=Q4ha^%PqEI#5Rc6g{g6@Tg! z2*E>OTZe>%;yT+`w;bZXJU;fWUU$3RejBvBMU*=DQw2CYJoG`~yx;GSr9VV|%s%(+ z>PG~wYvKs;KXf|Y?bqt}#h2d+Z26_&&rKt_yu3V9kr-Af?RIx}y%_eI_Z6YJpP#${ zq~FfYj;rpP<2pO8Zg~>ErohK%L-%<0sdHC-_uaLtsn<)!Pa?^KXlZH52P+Z;hWgZd zyTEyv80wP1a#VVKOobOaBxq+)>5|pzBA${NdWm1 z_-%Ey=d!{NZ7#f#Up_Y0*4BnR6R>AzXE*Bfj|OKbFa^MvgrEIGhuz z#pd`3l9oB}r@jR&`0DDa4;BFkR>5oTQLm0+4iN}G2Y%EuK*|&JT?hS$!T7tzrS|2- zkA4kW5}E=E7;DS9GC-NvB!092x@&xz5^Q)ts>$#F(7)<`8(%z%EeaF`iULJ}qCiog zC{PqA3KRv30!4wMKvAG5@L&~4UJ)WvyXI$?ss6-@5cpaZ5;kodb(Z3y7Dcb!U;nZu z5Ago}zGIuL)oS^L&`HZ=_PQp^V6g%XHXPsrC%83v`;LdAvlx*On4Gxr3 zI7DxZ5Tv%gDOW_?=H@0ve~6IkIqjS3PZIB5y>(BnK6{ud^$FUSvD@3*(eOzb5PBu; z6gZZxvJ~}0e=&73fcbAXMo&&oYR8fM5DZCLB4J;ydXtz*Q(#g++<9fer2ZUj7EfZ- z#YxHl($4~sdJwoT3F|YqEZi{tLyocjqQ*^n&DsA5P>ynRk3nGA{|AJwCUFeM*m}~# z1Lxt_7Vluaim+k71#6-V2fco=-EQ|r43jwCg&REuaLoQZPkuR6@FGM%ohD|0`?Asz!1na z4RUaZ7C?gVlvO6E4T})DKZ1n!FK`f-Vv7PrfucZBpeXQw75D|LYvG_OGwzW90000< KMNUMnLSTY~%*Hza literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2d6b1f2739eca09050a0cfc37fd4f2c49b1fcafe GIT binary patch literal 1579 zcmV+`2Gse9P)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zTK~#7F?V2%Y6hRb*$K(c*X1jItL6+s&zU}dFP*;orAmNr&O3K7zZM3EF?V-r#+ia7~qbBTB%ckVZL zFPUua_Gb2WV}diVJG--Q-~YdV-t6A(j8eXM1-t@Y0k42pz$@St_)ir$upi?d85yaS z%jHe#*=$xVEiJ{0rEAlR#X&xwuT9*Ut5HKjHnZKrO>7gvA$Wq8jdS7U>fBlYz@I*U zrF!4oSA{}h6C4tp)6RA5TuIp2r-g5oHuSWp-Ht51!4@|qoB22KE0v1s?d{!RChe~H zZ8IPYz6054fP@Ieea5BOhhhBl3k%xU#rb(%|ElD4jVN*O+X{epg2H*JRMNFZZ0sPi z)_r2zb?lQYCjQ&WN$q+i*q{2gmB1!H7yL{VQPj`nayq3YwZhJ4145bKi&_9|DA;gc zP->kFg;w}71U?_Hse|2zmD(t&RaFRheg)GBzikGftU0D7)ihFLhmDXTVC-p2qJ;7B zN!y31Deb;*3wPfmd$L(5PR<9{!U6Oe0++) zQqv|pT=2IB5gytUNlDD4$2k@fJR>?ud3;3`c_3ob4ByPuC_m=4$P6$IIYwE6&78cX zhsB@q8@lG4cFC0ReMy}Y;M%css&C?o#;cvVrEAV<=elcg$^d?hkY=(iFE8sKK>*8E zEEb)7x)4qSKk_YLk^_8nbW{h500hi0Kx!F#oCl?rh6rilTMYqGo?xSjh=F~So$IwU z@vYOP)5-wJyd?3h1(06jNldWe0;x3L0D||g@r8%4y#ihVuYgy;E8rFI z3U~#)0$u^HfLFjP;1%!+>{|t#zX%bj`OVM#Otl+dgus`tLV`^jCC;ZftB;~}_w_vs z5dbb+d!~kmhxHs_n22eg#xbAd_yW!RBOKrY2e`T7ISDW}JyR>s&eZ1x-akigWdcvyDF|0ji60YVF7N^*_=JCMg@>PHn&yY&v4S z;jr3d)+!3iNdVGI)&Lw0GJ&#wXh>B80;~}rE7X&lQFt9+lisd;dZ|~T^aMRmS@~Ji zb@}59UEA)QUV}10DzCrYULQbENprBy0D%AH`Tz+&X%1Fz0a3l(6PD{_2llopXls`i z2kRkV5|AMv0aKgDasHIp2$2Q{YXO9y{1cONsS(BHC#c*Pr``)3;_&wOcm=!yUIDLw dS747R@E29d*aKIBi3|V$002ovPDHLkV1nBf?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT+$MZ;a2!fbYu?QA6 zf~7AYg4o%r;A03{_!gEbSlRgm7Kf!TkTj_hkrWaH(?q|Oz01WM*%hpA7dD%j*_r>( zzmpYl!zthta0)EC0!uam_`Y8U$2XGQoyur5nxvLxDcYasxmC@KVBBy3wg=#**Ka%5*-incz+x-#1w2fiMd5`Gr2qf` M07*qoM6N<$f&#^YumAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1f07a4271bcd6a3f2c4a6759164dad8027822507 GIT binary patch literal 1012 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TF~Js5)V{oNJvOj2+V8P$erBkvi#f@Z*zfHA%-OfK5REC(orvz zS)R4TKIrw6r2pmLkA8b3+$7F9fdK3y(`;qp0WG2dEN5cuXo*Ft<)T z7wr_8d{Skp|Tb6mQ3ib-2_d#-sDVyixpxiL~@ZFaJ*S_9i^tb5@ zgTLgqqm<69R&-eFB*}5muT7`$ zT9VOu-m_9nbJQODT>2WbDUjjJ6VXIg#*?dyUAE{6?0L;R<#X;fJyVv{EFppF#c2#o zdaD#29NlKlYB|Qpz!LMU=)jcnx!e~#SmK&{r%Uh?;mg8kZeeabbj#pq-7h6 eM+1uq)BZR2|Ev#DI}rd(O$?r{elF{r5}E)A!_mQb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFWIC={sd47(u_NUlG}q|p)QHSK@JY%$Dark9Z1LP%VX{NbevLy0I&)^bZMhM>{;cO2*T9fHd-hc`FZ6vs z@onnE3nf-lbxvo!E|i)6`S#nef~S>wtFNxwc04Wr#Lk~JaXY^F`4qmY5n!35a=8n{x-c%}a z?B7Pyt9M-2o7Svzopr07ZMVkpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6a803250e618ea31a935ab76d9718e8ad20ea696 GIT binary patch literal 1548 zcmV+n2J`ueP)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zTDNM2kzr3%c%a zj&}}|3pcabQG+wE_vYWd?|a|A+1s04rDBN+LQXP2N~+OlWQt{5*Na1?QmG{M>(3G_B;+vr9o%G|A~*z3&~nfgUcSzq1pxfPqo=C) z{FbU#t6gwN(59bp=J}FvnI8(@DQ!5@qIN&BoDGhwDcQ@viQjIwRk2uHH%#rKS%%vBrzaK5~}tU=6ZAhNps zpzfD(MBsaQ6dV7=__%iaIsH8R@pl57{Cx2H3h?^=m4TnNGwSP}V>-0~GLM;*P~qD< z-ADQ{kNJEr4*`1Ni{G~g5;eGUw{EVes^;g5??sXe(a6Y%4%S?U2ts>dVL>&UO)sAk zjEeIrIHe zjB&(ZK1$?OLgG6w0h0tlN*0Kf;IW}HK(O+}cNRd-Cby=&G67O~-v0}pZT~jD%_p{_ z0#SjeKvWE%2to4bYiMtUsv6$4U#-2otLuCSp>9XO%K7vqiN~ids-Yk6 zH45(#6jnYdf>~W^D%I#@rV9nH46q&6>-9te$MUGkM}6C$OPdT}378K?=jZ1$$KiDi z=ta;Z(rY|KU!Is=OQ2UUoO#KDUgIJ9Ogs@ID~?wNkbWi*sRx10k}!R`)&K~qT-df}57wpXz=M3Nmg!cou@(bw1#DsoOD)$47hrAgQ4uZ$ohJ)~dn=c2a3;-BV zNiPXpfWLEBd3m~Mp%1S0k y9~L1(-vkNXzraDbL>m=|3Pc5>0#Si2tiUhyW~`!Uj^*kA0000_=* literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..901251c5891b7142d2ae3edefde3c68850aac8a1 GIT binary patch literal 1550 zcmV+p2J!icP)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT3kK~#7F?V7P`6hRopCnlaCN#PO56>@^P zLQ+|nG*OT=3WA`GXs@;ZfK@905yeUn1S=6Vg~mFKxk9nHgK%jQg@dr}Z!RwxH&4?{W@aXNcI#n64hdauy+=2NO@xE-)Q zH1@zDL795mu?r>PV_y}%SJ*JpQhO9xMuV$pNDk}Y#qam~rdF#RFjIXf{>TW(f*(M3 zDj*@Dc+P1me4E9;vASyey0fxk^UZ$U=7>@Rf208Pj#G5r>-B7I5qCcz@@xFkU+vhJ znOyvj^Ygarjr4Qw=Y9aY{6g?2@`$2-ylEJeQ{AC{y7u zd`*G1i-|cmK4r{K&up7U%JT=9LHHvh0A<}dtx&T_yC2wy6b@rgT^T8hPoLC%UR<=@ zpWpdz%V+xo=R@&x1-M;rnY)cSb8T!e&ouhvIIPR9hZXib$MZ)?hvCzw1XfO+c!c2Z zPa=94kra}cX~ek~3EmM$33>X;OL`$NA9J75KT| z0xmhgTdkIL6ajFUUx4JAdz90ZR3SoD_+C>$%HwQak{Hf2?0Kz+IeDR2RR3Iu46^IH%1)>5`fv7-KASw_Qhzdjn zq5@HYQ>#GmiV&Wvga_Jv*06wuZb;B12d%0*&_rs}ORaNvO85g zGVAZ9ha@jX`<6Cy|5aChEh4&BXa(ZCoRk!Qg zl?f8yYm&bBc0=BzJHsT6f=kL9{RoEO3Y&pY+DZ=YTB&VV9wY$ar85B27Y3(Bc>6+t zGXg}#a=SeYr?fha_NRWwog(^g&j;X0*&Mth0N|56 zA0X$;=HT@$Ak{~`VQD8iu+Iy-B5hT1@SXxL0ZjopOzz$n`BUN}N);Tu1rR~~6H{3^ zqJ;be)pJGie}O|0-tn2JKvW@~07*qoM6N<$f_xR= AfB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ad4965b19702c532d0547433bdabd2477483514b GIT binary patch literal 829 zcmV-D1H$}?P)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT zfUD6p6#Re((9rM)-ax|#_yRPD<|-N|$zCL?vn9vbUGL6h zyfIN2L4lw^P+->;m`DUj)3m=nS~kGFU9qzlTj z%n$$xOxW-vj(v_&8(}ZDd7k$SwvjzzKn={YEWK(w6&QkdT{i-`b|KD0k++U)e{&MJ zn$1m76xUjlP2zI7r0@M>A1)%M!NXlO8{l=<2r34p_{s*3*YF8~Qh%PRnR4*h0>;Nk3nv08Q?*!Eb?HlK*V z=_E1o&nYp#+9FnFg$)vjONY1zaOvPb$BL%o6~_Qu+5-nt#(dsP0xNv%m(~*<0YHkP zFbV(&UyK0~@c)H`=m-FY8xDZ>0J!hQb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFA;R)WW6|NZlIyYKp~ z30pnqS&Grb4f$rX=iGgE{Ytdn^r^`?R;4-jsv9JA<}e*AvHClowNS?UK%?y6(@dLR zzKr@+JJauO`8|ebk9WUWy*yLv+UwGD@4E#)J*(5(etYeKY6pk^n^t@9cRIg+{%2Rt zj_vb7t^Hh=N%cb3KiGcHJ%^OiOu48bwx$to8MUmmY7iIhNd1X zQ_i`}3>-VoJZ;c?Z}pa+tNs6iuZ+7sY<&0C^!?+_n~fPxZfZO5d~z`l=L81M43;{^ ZhfjW9%G)e32bhi+JYD@<);T3K0RV9;*98Co literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aabe0f3a79d181e9e219d01608a4617c9319d5c7 GIT binary patch literal 962 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFp7Q4FCT8kznY*38w4h@1Jqyi<^2tgIRD$EjTv)it8J;+6gPYF4DU%x{#I0SvmH|0Ykd3k zp@lzd^k$!3wtZiW-tM2vGFif7uLp^^=J%hScYdeN>8R=VjDzP`$-7QmlKD&gl>v)J zM#SM(!*8?AYWfxi&tLytZ*Mh&T>d+&=c`st+N8tkcI86tywm4@Zq3;qeb9<0`Tvz! zS#pc7OYQT2x$5t)bx$_0Rq1!>EC zsS%@igKHdY X=lf=JX8K29+F^>bP0l+XkKvL3lf literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e7c2600368ea340b35005bbaab18db408ccb01bd GIT binary patch literal 1500 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 Qng9R*07*qoM6N<$f_1Fog8%>k literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..635eb5e132271d317d3edaa5da094bfbb9e8732c GIT binary patch literal 830 zcmV-E1Ht@>P)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT^E8L9A>Q zYr)3O#-HFHI4c_)yR)?LPuN;n9-@u4m^1+)X;KA|AVl869K)()#`bm~%+7wyd-Ha( zM8SdrL4lyavMaD+5gpJ53rfEz$)tdqSc6&gFSMSvK{Q{f^ zQ54a`#U^c^J(7ilia?&{11gqPGqCTW2EMW^RkoR|AGV-o>Rh>E58v0NJ)n+RMU zeL4AWPABeHyFcG>9x+H@-D>6@KojCWhey+~$2B0fJVGG5W@XIx%_QJ4$Me>FrYitQ zQ4~%A0HIQb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TF+9V$GLTa zgN+aS&T*K?YAE16A;aW8!+G`@P6wAi;9l@i*uYWEvn-9v)KTn+Q_!dVOP5q?QSXg9Oa%R(QBt=naw_$zcFIP$&^jYZod9%@}_d$`kS$@z4l(r z2zmARQs+k5V?NuSpGqj?H(+Z%cwg_u_uoms#DPm3Z|?DzZ%RKK~=YJatE>}sEU8@cIOGrl_iR%t5wtyKBP>3*%`8h`(~ z_$BdEU%QE_&*z`yX1q5)ZpGafGwiPDr^QW@ZD5U+-#I~lzy6IYRr^Xa)Nuq5Jm7x( zXDR4;x5~4_w(tM{nN~`7LYy0-S|vD6`nAavzB{6Fo;Q`3(Qk60nq-w;q&9<5rSlC3 zhfmLB1Zz23PJLxe`&j!;(Uir|l(S=Rm^B0A^s5336qJ{#Ei41(K;M0QH$E-AUAJ_@ zFaId{1n&3QIr~3{UR(2)&tcOV#TB1UymV$#abOZ_jCVKv)7E?Nk~%Q;FnGH9xvXQb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFsE ztU`--2#ab2g$jI?;91}Jobesw1I-FXlYNg2o~U?cuL=-d;uz!Mwa>dP=KHs8d%14; z?(?1X_TTKf&#$+nxwZ7Ncr;)~b6DoR7ynvgw|?$yw=FlK*Prz~)0!AjzxPfh^FrVE zoo`bgUdS<<{I%+CME{};>-{%#Si(a?Cq1uB?mv5PLb2zhD|&mEFS97EvzqHAbG&{b zpL0V~n`w+h^8U=^6NV+PK7YNpw4DFI@5@iG?cAiZRD-Kg(6nUsvQM?!Cg_}Id2P`1 zH#vLN&hEJEANy?MuFL;it`n~=#B%UjV5!hUmgm#W?TZBGoxXbbRF?Di|K3QDziUz=IkUId23#+xz*wv(=^NHw)xS8J|U}DAlYIH~6|et*yYJxW%J=dFCyP zW*?oPfE_g}#4V&6tkz40f8lbx{LJ8$cFW#h43j5B>Nk8%{`7v?-i^J|4{JQ;od3$y zUUTWEA4AFKch4Vq?`_Dkzf!)6-+({+UTk&o-Q^zx1sRSDur6y(UMFs_waAA_#eqp> cgYyINm24tYtz7S)2Br@NPgg&ebxsLQ00fz~OaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7af7311a7ae2e3851e0883042de6208e2c81b1f3 GIT binary patch literal 1552 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 KMNUMnLSTYt2?+uK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..66118f2fdc362fb4f8c1449914eac069b6a13579 GIT binary patch literal 812 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 JWt~$(69D7!wfg`7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1dd9575b96ee53c3aafd0e1c30bc9e747d401396 GIT binary patch literal 1669 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6dfd0af7c3887c0d754cd1f03b0cd99036b888b9 GIT binary patch literal 1652 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 FV1f`h1C#&& literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..feecd435a3e08788c9ac6ca1f32d1308f1ebb1d8 GIT binary patch literal 840 zcmV-O1GoH%P)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT{Bn)Uz+f`EJ1b$dx*z=wHsC{mWCQ*LXJfQ#f);KBwZ&_KYI zg!Kq+vo*^M;JU6EK$L)SljrnvdcpJXBMxM-&ZSuuK$82_b^rObqxbKM&szupY%Dzp zT%8#@UqtkjzdGf13X+|mz>F~isDR5@RTcf)EdU9r10i%c+Wd#{u&p&PwMe9gPj){Q z=Q5`vu$)C)WNV7J$~U3m5jIG{uWjlY$g+%Y10Ek~C_dOlQK)M`MF4LCK*!)?68Lw0 zfMlKO2(U=N@z7w$7{~K$C_ZyVtn7}TWdP&K{Z&4z;`;Jw@O-RSz$Qb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFA;R)WW6|NZlIyYKp~ z30pnqS&Grb4f$rX=iGgE{Ytdn^r^`?R;4-jsv9JA<}e*AvHClowNS?UK%?y6(@dLR zzKr@+JJauO`8|ebk9WUWy*yLv+UwGD@4E#)J*(5(etYeKY6pk^n^t@9cRIg+{%2Rt zj_vb7t^Hh=N%cb3KiGcHJ%^OiOu48bwx$to8MUmmY7iIhNd1X zQ_i`}3>-VoJZ;c?Z}pa+tNs6iuZ+7sY<&0C^!?+_n~fPxZfZO5d~z`l=L81M43;{^ ZhfjW9%G)e32bhi+JYD@<);T3K0RV9;*98Co literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aabe0f3a79d181e9e219d01608a4617c9319d5c7 GIT binary patch literal 962 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFp7Q4FCT8kznY*38w4h@1Jqyi<^2tgIRD$EjTv)it8J;+6gPYF4DU%x{#I0SvmH|0Ykd3k zp@lzd^k$!3wtZiW-tM2vGFif7uLp^^=J%hScYdeN>8R=VjDzP`$-7QmlKD&gl>v)J zM#SM(!*8?AYWfxi&tLytZ*Mh&T>d+&=c`st+N8tkcI86tywm4@Zq3;qeb9<0`Tvz! zS#pc7OYQT2x$5t)bx$_0Rq1!>EC zsS%@igKHdY X=lf=JX8K29+F^>bP0l+XkKvL3lf literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a591968dd378c9e5be33355f44bcffcaf8dc5282 GIT binary patch literal 1607 zcmV-N2Dtf&P)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT5`fv7-KAS!S{6_`7ZaW5?`^}F5fkb1dX zc87fX~n77{wb_6%-v4-pQ*6SNNM;$?N7SpdMdUT(S%ou;c+ zt3z-|P^X=K##u>Z89y!jOliZFCeTu;W=HE*dyg8pe1?lHGcO72dn>hbPZ z>fTbPoqlUEtyk7yy~`N(4RXeHGNHfix;eg7~m0RRa^=hXw0-M zIKszL*FoJ{Oag>K0`}*b>;F#xIPA9)$ueI4C4lgSt^O>&G{(FHG*Mu(YCmr_w*coY z&~bb(ya1+qz^KQJ*5f#Zi)vKN5g1?k3^ z98+W+46qOY>|`0mF*zozoAw35i8_DRKJbs8&*ipj@9n91YWB_EwtopCP_QR0rVIcq zOtD6z;a^GhTn^s}CM7m*zA(T<1UP7H$W3i&*8KS3O$-tc;IStnkg>dgq!Bx-pFrWj zAr4qLSpOd|3jnc@0HCuBUcwZ`!Mp@S;D51&2tWqRx)g<3hyb$=zDT@W0)*;w^Z8dL z#11)G_~d>M2*J4<5AMDe+=<76Nzn0k0TW9Z9b9Y$egmF#ZyEQ0Fc|;<002ovPDHLk FV1grx?5zL* literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..9468844dc023264f224a2a82c7a7928fcdf23467 GIT binary patch literal 1677 zcmV;826Fj{P)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT1cgqB+Xx}<5;=5`fv7-K;6GJh(L#*7QmHiS^?IB7 z$jFGR)oO)e8EAXSu`@O{*1UdVeG>}_ZDD&3H-(1?hu{fX8+GxrI?t^d;IFRkbbBwn zca28l51gT)A$R}GTDR%=BR4%go!jppjxrj0g`bNkGmY8=$(AJm?QG0Q(Uj~IzwqIJ ze>kLz+QGKq&$$Fb@T}k=BLYfGj!Tm)QV;RL*z@$MceDTDLvKGdM!gj`EB>4U;9bg3 zO-;4IGz$k4LbJ;@`F8pt$@nsh@MmUb+=K1gz3Y$3@78y}6Bu0jt@wl8h@$@J=%`OA zrIvz|0C#rpc7xwud0@s+7{hT%Y0hUUWZ?_@`MRcCx_E_iKW5w)H=gi(3#JKw&I~}& za7_WuMtf*QihvnUe;Fl>k5AejC&E*f|9Io;OB$`iI+Oi3SCR-FJ(?fUGl9Ub;~+;@OWop$=I#gqZuj8v;t$Ju^- ze7udN`sCzfPi}$)L+UZa30>iG-_a!`7l+eP# zT1-m-=OUnVlU2KwfOWj^I4*17;?tA?attt=W}SA;gvRvBf+Kt^b#2tG#Uwx&Bw)Y( z^!Wb?0EhinB6-HkzXTAzu+^W(m&TZvfDROxtlAfvEiAx73p9)Ge=mUP9MI`9qxG1j zaGC9$@bM1^?m=RS3Pc5>0#SjeKvWQn&lrwCxBCqcZjII2HwO%Fvc9vXI=D`+&@_~o0_0} z4o#OqU4s#V%U{}Z87y))mXB&{RM{L%CqXC>G}mDSz^YDPcuzpR7eyE$cF4twY03bc zGXnx-#zh1nEH@xlqTzVmkikP7uyC+upjiNjgaiQXXYdlDEDq)+AOio2Ekyt_px>n| z%u)pCckpH66%rs+pOequDj{~r$->8UBNRFg!8sczXWy{9=lft1bo?%$=Tb+2e_Mf{ X^ZvUoObXNA00000NkvXXu0mjf-clD+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f0a6bc8f174dfb126d79d2a8a61926ce99cb8411 GIT binary patch literal 834 zcmV-I1HJr-P)?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT^E#a#-0a z)`Gn@{sjNPS=rcJca|3Z30o^`(JQRQq&X0BeF_N&(KqnI3Le?1Zx?d2A2a)A-o6`= zFaiUCfxy6~Gq7bLAW4#LcCjOq$8U+_xDRcbM!3IRE=_lOI|Kal;Y3cSU(&X156(#x zMe=;JFXO8hu_WP@K%VCvDh3F?bqQb}9~h~s%IoeyCxVmm|G-@qFh>HuNsJi0&c5Fr z>U#sYu4{E86Ih(j=d#)z>psrmhh!1wGX@#JC2zCi?xU(zd}*5gc?v!W6NDHK@>Gr{ zuU>b1Ik6H5G0U=E2Lz{GEEXmK;@-h0AUG^_;O@Eep>x-lb5jBg0^O(@gVpoQYE22; zo~=}5_m?A8`P22DTC9;2&aK0&fubn%-vBXkK>b*kWog!cDFO5ZfV$vr5}5loAjX-V z06_#tqd~>6?!GPzKidXhR;O(l!07qE%2!r=JD&wF_yz_71DnCX4@0xGHNhn<1ONa4 M07*qoM6N<$g7fHh%m4rY literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d73e872ccffd2791d51afa65bb1ad1b20b2de48f GIT binary patch literal 996 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TF+9V$GLTa zgN+aS&T*K?YAE16A;aW8!+G`@P6wAi;9l@i*uYWEvn-9v)KTn+Q_!dVOP5q?QSXg9Oa%R(QBt=naw_$zcFIP$&^jYZod9%@}_d$`kS$@z4l(r z2zmARQs+k5V?NuSpGqj?H(+Z%cwg_u_uoms#DPm3Z|?DzZ%RKK~=YJatE>}sEU8@cIOGrl_iR%t5wtyKBP>3*%`8h`(~ z_$BdEU%QE_&*z`yX1q5)ZpGafGwiPDr^QW@ZD5U+-#I~lzy6IYRr^Xa)Nuq5Jm7x( zXDR4;x5~4_w(tM{nN~`7LYy0-S|vD6`nAavzB{6Fo;Q`3(Qk60nq-w;q&9<5rSlC3 zhfmLB1Zz23PJLxe`&j!;(Uir|l(S=Rm^B0A^s5336qJ{#Ei41(K;M0QH$E-AUAJ_@ zFaId{1n&3QIr~3{UR(2)&tcOV#TB1UymV$#abOZ_jCVKv)7E?Nk~%Q;FnGH9xvXQb`Ho)PG(@xm{>Z|+MC%? zq}6`0(0xr2k&QQ;jw&@SP?#p->7+P5Y5qH5?j=}{!smbwF#>g zIJy*)GT*MAxZ&POHX)Unso(16%q*U1$-M68lzH2t{!BRc-I%Xi*yx$Ms` zw`D_~B)9iwMXA2|?z2K_Kdg-F{eD$;?!_5Por7n8Sdurx@?qw~pKIqVtnlCA@87og zkouvxU_OnS)n7Ue=XVM7)oYqLACxRuIWKBao3iN|^|M<(%=l1XHTAmo^FZ^LU8&Qi zFX1~Sb4clg45NwClbb58eDkmLq=emnuK!!?WS9H&{f>;mGMtkheeIexeVyUT!i&kD zmTIiH^Z$9~QT1bU-^DU!)NXxyUa;W3^U93d`txlCKGy`TFsE ztU`--2#ab2g$jI?;91}Jobesw1I-FXlYNg2o~U?cuL=-d;uz!Mwa>dP=KHs8d%14; z?(?1X_TTKf&#$+nxwZ7Ncr;)~b6DoR7ynvgw|?$yw=FlK*Prz~)0!AjzxPfh^FrVE zoo`bgUdS<<{I%+CME{};>-{%#Si(a?Cq1uB?mv5PLb2zhD|&mEFS97EvzqHAbG&{b zpL0V~n`w+h^8U=^6NV+PK7YNpw4DFI@5@iG?cAiZRD-Kg(6nUsvQM?!Cg_}Id2P`1 zH#vLN&hEJEANy?MuFL;it`n~=#B%UjV5!hUmgm#W?TZBGoxXbbRF?Di|K3QDziUz=IkUId23#+xz*wv(=^NHw)xS8J|U}DAlYIH~6|et*yYJxW%J=dFCyP zW*?oPfE_g}#4V&6tkz40f8lbx{LJ8$cFW#h43j5B>Nk8%{`7v?-i^J|4{JQ;od3$y zUUTWEA4AFKch4Vq?`_Dkzf!)6-+({+UTk&o-Q^zx1sRSDur6y(UMFs_waAA_#eqp> cgYyINm24tYtz7S)2Br@NPgg&ebxsLQ00fz~OaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..2ebe09f87fd7c5c2bc560b15af54bee00134ae4e GIT binary patch literal 1766 zcmV?TOC6>Ka57NU)> z!hfKxV5=YqiXdWX?W>Wn-pK|MB$;LQew>+enK=Wl`IMfvTKtgCli&9v~C@Nhbn*DL2yH|dIHmY1Xs z${fNX$Q%JQBIMa5MGl|TjAT~d=P&yf$%;ppzd-?090`)*^@^I8t}&@`(PQ$ZD5%{3 z=V`?!#+~k60cd@-?avW#??b6*+rOu_T{?s27r4$;{aMLr>Ra?;RU1AA&kkJPRJF(f zT;`33 zWGRYiZU#&{i~gCwsz9JQ?JuAvPl)xyzct*zW2U*^}46Kol7M#kQhh|BnA=#iGjqx z6UsnsKlr&G$80|PA)2Xk|CTUXD%u!Y13)v!H6P3a-R!Filk z}Il}ED%_?^qIxi>%i&GmY{hj6B*rrh@*Kj#j=|ASjwTZ`8FkfMTyap6Z9%1XmF zPEv~qpqfDLCG&=jEOQ>>gK^^4EwAS7 zn>W4uv)AxawpsB<67bXK$NXLcyxZ*#z_bb{GlMn{9`^0@GY%t|S49c&*VotGjpN6? z+WXn>%lCEy7+m_T_#+9(_I&N)$xZjcD}VUV0)VRWZM*I2f8X(KgdXD<&%A8)G_17D z!z?!<`o@VbebYSiUFo-)oIsCXw0}IIKoGAuFAQ!meFt3O7U#+bK&CJIba?fXrZCSbogT4e7NPk<>0x4c zlPXmbZi;{lr>3(l0B4&{TR=`vG6Jf^G7)h8dOf=Y{?kvKck#WJt%lzQRT?Ey_mV^b zb$NMtS0X1#jx7nY1@sNTk>>X6@uRInJ{j_j08uf!)Y;4KNA6R?d+%z`e}yu;w7g4a z(Kg*RC^*^0UeKO<*uMtX0O9i2mxH@9E`w$6#&W?58g(Ba8-^o*ev1vJB#2EJu)hvN zKz2R$&g;4y-V+qq|H#e402310?e^fthw!%om?8k>Fx+>3@UaAjP%V4UYG^oKH)PmB z)IkOk8!W4jPBQ^a3JsXF^WamevcbFsw&5S2-%1D|3MO5u!mNaVNjqO9UMT`X_DMef zR|&C0n=JO2?gT@{AvoDM%f4av*pI=)>GWN|*r`qck2eGV0gng5*;cKaH~;_u07*qo IM6N<$f Date: Thu, 26 Sep 2024 22:36:00 +0200 Subject: [PATCH 016/561] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 53086154e67..3e44ba1bd10 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: VMSolidus - changes: - - message: Harpies can now be stripped, and can randomly be psychic - type: Fix - id: 83 - time: '2023-10-23T23:32:00.0000000+00:00' - author: FluffiestFloof changes: - message: Fixed Mantis not having their Metapsionic Pulse. @@ -3631,3 +3625,13 @@ id: 582 time: '2024-09-24T19:48:45.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1908 +- author: TadJohnson00 + changes: + - message: Added turtlenecks to most security roles. Helps to keep the chill out + on cool nights. + type: Add + - message: Removed security greatcoats from loadouts and the vendor. + type: Remove + id: 583 + time: '2024-09-26T20:35:41.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1901 From 6a809889b0bec7e9e35aa63ef8105552cef85884 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Fri, 27 Sep 2024 04:50:41 -0500 Subject: [PATCH 017/561] Adds load acts + action bar loadout files (#1921) Co-authored-by: Velcroboy --- Content.Client/Commands/ActionsCommands.cs | 27 +++- Resources/mapping_actions_alarms.yml | 139 ++++++++++++++++++++ Resources/mapping_actions_deltav.yml | 136 ++++++++++++++++++++ Resources/mapping_actions_disposals.yml | 140 +++++++++++++++++++++ Resources/mapping_actions_pipes.yml | 139 ++++++++++++++++++++ Resources/mapping_actions_power.yml | 139 ++++++++++++++++++++ 6 files changed, 718 insertions(+), 2 deletions(-) create mode 100644 Resources/mapping_actions_alarms.yml create mode 100644 Resources/mapping_actions_deltav.yml create mode 100644 Resources/mapping_actions_disposals.yml create mode 100644 Resources/mapping_actions_pipes.yml create mode 100644 Resources/mapping_actions_power.yml diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs index c155c7a9dea..738a6544763 100644 --- a/Content.Client/Commands/ActionsCommands.cs +++ b/Content.Client/Commands/ActionsCommands.cs @@ -1,5 +1,8 @@ -using Content.Client.Actions; +using Content.Client.Actions; +using System.IO; using Content.Shared.Administration; +using Robust.Client.UserInterface; +using YamlDotNet.RepresentationModel; using Robust.Shared.Console; namespace Content.Client.Commands; @@ -46,7 +49,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 1) { - shell.WriteLine(Help); + LoadActs(); // DeltaV - Load from a file dialogue instead return; } @@ -59,4 +62,24 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error")); } } + + /// + /// DeltaV - Load actions from a file stream instead + /// + private static async void LoadActs() + { + var fileMan = IoCManager.Resolve(); + var actMan = IoCManager.Resolve().GetEntitySystem(); + + var stream = await fileMan.OpenFile(new FileDialogFilters(new FileDialogFilters.Group("yml"))); + if (stream is null) + return; + + var reader = new StreamReader(stream); + var yamlStream = new YamlStream(); + yamlStream.Load(reader); + + actMan.LoadActionAssignments(yamlStream); + reader.Close(); + } } diff --git a/Resources/mapping_actions_alarms.yml b/Resources/mapping_actions_alarms.yml new file mode 100644 index 00000000000..ce569d7d052 --- /dev/null +++ b/Resources/mapping_actions_alarms.yml @@ -0,0 +1,139 @@ +- action: !type:InstantActionComponent + icon: + entity: AirAlarm + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: AirAlarm + assignments: + - 0: 1 + name: Air Alarm +- action: !type:InstantActionComponent + icon: + entity: FireAlarm + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: FireAlarm + assignments: + - 0: 2 + name: Fire Alarm +- action: !type:InstantActionComponent + icon: + entity: AirSensor + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: AirSensor + assignments: + - 0: 3 + name: Air Sensor +- action: !type:InstantActionComponent + icon: + entity: Firelock + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Firelock + assignments: + - 0: 4 + name: Firelock +- action: !type:InstantActionComponent + icon: + entity: FirelockGlass + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: FirelockGlass + assignments: + - 0: 5 + name: Firelock Glass +- action: !type:InstantActionComponent + icon: + entity: FirelockEdge + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: FirelockEdge + assignments: + - 0: 6 + name: Firelock Edge +- action: !type:InstantActionComponent + icon: + entity: Multitool + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Multitool + assignments: + - 0: 7 + name: Multitool +- action: !type:InstantActionComponent + icon: + entity: GasVentScrubber + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentScrubber + assignments: + - 0: 8 + name: Gas Vent Scrubber +- action: !type:InstantActionComponent + icon: + entity: GasVentPump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentPump + assignments: + - 0: 9 + name: Gas Vent Pump +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_deltav.yml b/Resources/mapping_actions_deltav.yml new file mode 100644 index 00000000000..2cf8994595d --- /dev/null +++ b/Resources/mapping_actions_deltav.yml @@ -0,0 +1,136 @@ +- action: !type:InstantActionComponent + icon: + entity: WallSolid + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: WallSolid + assignments: + - 0: 1 + name: Wall Solid +- action: !type:InstantActionComponent + icon: + entity: WallReinforced + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: WallReinforced + assignments: + - 0: 2 + name: WallReinforced +- action: !type:InstantActionComponent + icon: + entity: Window + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Window + assignments: + - 0: 3 + name: Window +- action: !type:InstantActionComponent + icon: + entity: ReinforcedWindow + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: ReinforcedWindow + assignments: + - 0: 4 + name: ReinforcedWindow +- action: !type:InstantActionComponent + icon: + entity: Grille + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Grille + assignments: + - 0: 5 + name: Grille +- action: !type:InstantActionComponent + icon: /Textures/Tiles/steel.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: AlignTileAny + tileId: FloorSteel + assignments: + - 0: 6 + name: steel floor +- action: !type:InstantActionComponent + icon: + entity: Firelock + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Firelock + assignments: + - 0: 7 + name: Firelock +- action: !type:InstantActionComponent + icon: /Textures/Tiles/plating.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: AlignTileAny + tileId: Plating + assignments: + - 0: 8 + name: plating +- action: !type:InstantActionComponent + icon: /Textures/Tiles/cropped_parallax.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: AlignTileAny + tileId: Space + assignments: + - 0: 9 + name: space +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_disposals.yml b/Resources/mapping_actions_disposals.yml new file mode 100644 index 00000000000..bcccbefc17e --- /dev/null +++ b/Resources/mapping_actions_disposals.yml @@ -0,0 +1,140 @@ + +- action: !type:InstantActionComponent + icon: + entity: DisposalUnit + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalUnit + assignments: + - 0: 1 + name: Disposal Unit +- action: !type:InstantActionComponent + icon: + entity: DisposalTrunk + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalTrunk + assignments: + - 0: 2 + name: Disposal Trunk +- action: !type:InstantActionComponent + icon: + entity: DisposalPipe + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalPipe + assignments: + - 0: 3 + name: Disposal Pipe +- action: !type:InstantActionComponent + icon: + entity: DisposalBend + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalBend + assignments: + - 0: 4 + name: Disposal Bend +- action: !type:InstantActionComponent + icon: + entity: DisposalJunction + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalJunction + assignments: + - 0: 5 + name: Disposal Junction +- action: !type:InstantActionComponent + icon: + entity: DisposalJunctionFlipped + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalJunctionFlipped + assignments: + - 0: 6 + name: Disposal Junction Flipped +- action: !type:InstantActionComponent + icon: + entity: DisposalYJunction + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalYJunction + assignments: + - 0: 7 + name: Disposal Y-Junction +- action: !type:InstantActionComponent + icon: + entity: DisposalTagger + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalTagger + assignments: + - 0: 8 + name: Disposal Tagger +- action: !type:InstantActionComponent + icon: + entity: SignDisposalSpace + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: SignDisposalSpace + assignments: + - 0: 9 + name: Sign Disposal Space +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_pipes.yml b/Resources/mapping_actions_pipes.yml new file mode 100644 index 00000000000..5799fead740 --- /dev/null +++ b/Resources/mapping_actions_pipes.yml @@ -0,0 +1,139 @@ +- action: !type:InstantActionComponent + icon: + entity: GasPipeStraight + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeStraight + assignments: + - 0: 1 + name: Gas Pipe Straight +- action: !type:InstantActionComponent + icon: + entity: GasPipeBend + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeBend + assignments: + - 0: 2 + name: Gas Pipe Bend +- action: !type:InstantActionComponent + icon: + entity: GasPipeTJunction + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeTJunction + assignments: + - 0: 3 + name: Gas Pipe T-Junction +- action: !type:InstantActionComponent + icon: + entity: GasPipeFourway + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeFourway + assignments: + - 0: 4 + name: Gas Pipe Fourway +- action: !type:InstantActionComponent + icon: + entity: GasVentScrubber + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentScrubber + assignments: + - 0: 5 + name: Gas Vent Scrubber +- action: !type:InstantActionComponent + icon: + entity: GasVentPump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentPump + assignments: + - 0: 6 + name: Gas Vent Pump +- action: !type:InstantActionComponent + icon: + entity: GasVolumePump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVolumePump + assignments: + - 0: 7 + name: Gas Volume Pump +- action: !type:InstantActionComponent + EntityIcon: + entity: GasPort + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPort + assignments: + - 0: 8 + name: Gas Port +- action: !type:InstantActionComponent + icon: + entity: GasPressurePump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPressurePump + assignments: + - 0: 9 + name: Gas Pressure Pump +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_power.yml b/Resources/mapping_actions_power.yml new file mode 100644 index 00000000000..f1e59b9789b --- /dev/null +++ b/Resources/mapping_actions_power.yml @@ -0,0 +1,139 @@ +- action: !type:InstantActionComponent + icon: + entity: APCBasic + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: APCBasic + assignments: + - 0: 1 + name: APC Basic +- action: !type:InstantActionComponent + icon: + entity: CableApcExtension + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableApcExtension + assignments: + - 0: 2 + name: Cable ApcExtension +- action: !type:InstantActionComponent + icon: + entity: CableMV + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableMV + assignments: + - 0: 3 + name: Cable MV +- action: !type:InstantActionComponent + icon: + entity: CableHV + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableHV + assignments: + - 0: 4 + name: Cable HV +- action: !type:InstantActionComponent + icon: + entity: SubstationBasic + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: SubstationBasic + assignments: + - 0: 5 + name: Substation Basic +- action: !type:InstantActionComponent + icon: + entity: SMESBasic + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: SMESBasic + assignments: + - 0: 6 + name: SMES Basic +- action: !type:InstantActionComponent + icon: + entity: CableTerminal + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableTerminal + assignments: + - 0: 7 + name: Cable Terminal +- action: !type:InstantActionComponent + icon: + entity: Poweredlight + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Poweredlight + assignments: + - 0: 8 + name: Powered light +- action: !type:InstantActionComponent + icon: + entity: PoweredSmallLightMaintenance + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: PoweredSmallLightMaintenance + assignments: + - 0: 9 + name: Small Light Maintenance +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... From c8d07c22de77e1dc02651982b576aca13c3dcf74 Mon Sep 17 00:00:00 2001 From: Milon Date: Sat, 28 Sep 2024 01:42:29 +0200 Subject: [PATCH 018/561] fix large mail description (#1925) fix --- Resources/Locale/en-US/_NF/mail/mail.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_NF/mail/mail.ftl b/Resources/Locale/en-US/_NF/mail/mail.ftl index 394c551fad5..7ab4f6b6f55 100644 --- a/Resources/Locale/en-US/_NF/mail/mail.ftl +++ b/Resources/Locale/en-US/_NF/mail/mail.ftl @@ -1,7 +1,8 @@ mail-large-item-name-unaddressed = package mail-large-item-name-addressed = package ({$recipient}) mail-large-desc-far = A large package. -mail-large-desc-close = A large package addressed to {CAPITALIZE($name)}, {$job}. Last known location: {$station}. +# DelaV - Removed "Last known location" +mail-large-desc-close = A large package addressed to {CAPITALIZE($name)}, {$job}. ### Frontier: mailtestbulk command-mailtestbulk = Sends one of each type of parcel to a given mail teleporter. Implicitly calls mailnow. From 9a9d29239eeac70303bd54cf3b32925e59cbbf27 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 28 Sep 2024 01:42:49 +0200 Subject: [PATCH 019/561] 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 3e44ba1bd10..b21378a0daf 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Fixed Mantis not having their Metapsionic Pulse. - type: Fix - id: 84 - time: '2023-10-23T23:40:59.0000000+00:00' - author: JJ changes: - message: Tweaked round weighting and lowered instances of Revs @@ -3635,3 +3629,10 @@ id: 583 time: '2024-09-26T20:35:41.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1901 +- author: MilonPL + changes: + - message: Fixed the description of large mail packages. + type: Fix + id: 584 + time: '2024-09-27T23:42:30.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1925 From 7a07bdeaa6ba088137453841fd5b7dc6a61376ca Mon Sep 17 00:00:00 2001 From: Milon Date: Sat, 28 Sep 2024 01:45:01 +0200 Subject: [PATCH 020/561] Revert "The Resprite: Diagonal Reinforced Wall, Greyscale Decal Cleanup, Secret Doors" (#1924) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "The Resprite: Diagonal Reinforced Wall, Greyscale Decal Cleanup, Secr…" This reverts commit fb61091db649eb92f1e013bb7eda93917e358c17. --- .../Prototypes/Decals/Overlays/grayscale.yml | 36 +-- .../Structures/Doors/Airlocks/assembly.yml | 62 ++--- .../Entities/Structures/Walls/walls.yml | 8 +- .../Entities/Structures/Doors/secret_door.yml | 81 ------ .../Structures/Walls/diagonal_walls.yml | 118 -------- .../Graphs/structures/secretdoor.yml | 251 ------------------ .../_NF/Recipes/Construction/structures.yml | 50 ---- .../Overlays/greyscale.rsi/checkerNESW.png | Bin 352 -> 0 bytes .../Overlays/greyscale.rsi/checkerNWSE.png | Bin 323 -> 0 bytes .../Overlays/greyscale.rsi/diagonal.png | Bin 1066 -> 0 bytes .../greyscale.rsi/diagonal_checker_a.png | Bin 1120 -> 0 bytes .../greyscale.rsi/diagonal_checker_b.png | Bin 425 -> 0 bytes .../greyscale.rsi/fulltile_overlay.png | Bin 440 -> 0 bytes .../greyscale.rsi/halftile_overlay.png | Bin 324 -> 0 bytes .../greyscale.rsi/halftile_overlay_180.png | Bin 315 -> 0 bytes .../greyscale.rsi/halftile_overlay_270.png | Bin 326 -> 0 bytes .../greyscale.rsi/halftile_overlay_90.png | Bin 347 -> 0 bytes .../Decals/Overlays/greyscale.rsi/meta.json | 66 ----- .../greyscale.rsi/quartertile_overlay.png | Bin 256 -> 0 bytes .../greyscale.rsi/quartertile_overlay_180.png | Bin 250 -> 0 bytes .../greyscale.rsi/quartertile_overlay_270.png | Bin 263 -> 0 bytes .../greyscale.rsi/quartertile_overlay_90.png | Bin 276 -> 0 bytes .../threequartertile_overlay.png | Bin 391 -> 0 bytes .../threequartertile_overlay_180.png | Bin 406 -> 0 bytes .../threequartertile_overlay_270.png | Bin 377 -> 0 bytes .../threequartertile_overlay_90.png | Bin 392 -> 0 bytes .../Textures/DeltaV/Tiles/attributions.yml | 8 +- Resources/Textures/DeltaV/Tiles/wood.png | Bin 779 -> 1448 bytes .../Textures/DeltaV/Tiles/wood_broken.png | Bin 1648 -> 6045 bytes .../Textures/DeltaV/Tiles/wood_large.png | Bin 1045 -> 1070 bytes Resources/Textures/DeltaV/Tiles/wood_tile.png | Bin 1011 -> 16449 bytes .../secret_door_reinforced.rsi/assembly.png | Bin 812 -> 0 bytes .../secret_door_reinforced.rsi/closed.png | Bin 742 -> 0 bytes .../secret_door_reinforced.rsi/closing.png | Bin 9823 -> 0 bytes .../secret_door_reinforced.rsi/meta.json | 60 ----- .../Doors/secret_door_reinforced.rsi/open.png | Bin 737 -> 0 bytes .../secret_door_reinforced.rsi/opening.png | Bin 9097 -> 0 bytes .../secret_door_shuttle.rsi/assembly.png | Bin 1113 -> 0 bytes .../Doors/secret_door_shuttle.rsi/closed.png | Bin 750 -> 0 bytes .../Doors/secret_door_shuttle.rsi/closing.png | Bin 17280 -> 0 bytes .../Doors/secret_door_shuttle.rsi/meta.json | 60 ----- .../Doors/secret_door_shuttle.rsi/open.png | Bin 875 -> 0 bytes .../Doors/secret_door_shuttle.rsi/opening.png | Bin 15807 -> 0 bytes .../secret_door_uranium.rsi/assembly.png | Bin 1952 -> 0 bytes .../Doors/secret_door_uranium.rsi/closed.png | Bin 1636 -> 0 bytes .../Doors/secret_door_uranium.rsi/closing.png | Bin 15054 -> 0 bytes .../Doors/secret_door_uranium.rsi/meta.json | 60 ----- .../Doors/secret_door_uranium.rsi/open.png | Bin 1325 -> 0 bytes .../Doors/secret_door_uranium.rsi/opening.png | Bin 14336 -> 0 bytes .../Doors/secret_door_wood.rsi/assembly.png | Bin 770 -> 0 bytes .../Doors/secret_door_wood.rsi/closed.png | Bin 700 -> 0 bytes .../Doors/secret_door_wood.rsi/closing.png | Bin 10061 -> 0 bytes .../Doors/secret_door_wood.rsi/meta.json | 60 ----- .../Doors/secret_door_wood.rsi/open.png | Bin 721 -> 0 bytes .../Doors/secret_door_wood.rsi/opening.png | Bin 9585 -> 0 bytes .../solid_reinforced_diagonal.rsi/meta.json | 17 -- .../solid_reinforced_diagonal.rsi/state0.png | Bin 5943 -> 0 bytes .../solid_reinforced_diagonal.rsi/state1.png | Bin 5829 -> 0 bytes .../Walls/uranium_diagonal.rsi/meta.json | 17 -- .../Walls/uranium_diagonal.rsi/state0.png | Bin 1415 -> 0 bytes .../Walls/uranium_diagonal.rsi/state1.png | Bin 1415 -> 0 bytes .../Walls/wood_diagonal.rsi/meta.json | 17 -- .../Walls/wood_diagonal.rsi/state0.png | Bin 6243 -> 0 bytes .../Walls/wood_diagonal.rsi/state1.png | Bin 6242 -> 0 bytes 64 files changed, 57 insertions(+), 914 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml delete mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/secretdoor.yml delete mode 100644 Resources/Prototypes/_NF/Recipes/Construction/structures.yml delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNESW.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNWSE.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/fulltile_overlay.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png delete mode 100644 Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closed.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closed.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png delete mode 100644 Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png delete mode 100644 Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state0.png delete mode 100644 Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state1.png delete mode 100644 Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state0.png delete mode 100644 Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state1.png delete mode 100644 Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state0.png delete mode 100644 Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state1.png diff --git a/Resources/Prototypes/Decals/Overlays/grayscale.yml b/Resources/Prototypes/Decals/Overlays/grayscale.yml index 86365081b8d..dfebeee3f91 100644 --- a/Resources/Prototypes/Decals/Overlays/grayscale.yml +++ b/Resources/Prototypes/Decals/Overlays/grayscale.yml @@ -3,7 +3,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: fulltile_overlay - type: decal @@ -115,7 +115,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay - type: decal @@ -123,7 +123,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay_90 - type: decal @@ -131,7 +131,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay_180 - type: decal @@ -139,7 +139,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay_270 - type: decal @@ -147,7 +147,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay - type: decal @@ -155,7 +155,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay_90 - type: decal @@ -163,7 +163,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay_180 - type: decal @@ -171,7 +171,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay_270 - type: decal @@ -179,7 +179,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay - type: decal @@ -187,7 +187,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay_90 - type: decal @@ -195,7 +195,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay_180 - type: decal @@ -203,7 +203,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay_270 - type: decal @@ -219,7 +219,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: checkerNESW - type: decal @@ -227,7 +227,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: checkerNWSE - type: decal @@ -235,7 +235,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: diagonal - type: decal @@ -243,7 +243,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: diagonal_checker_a - type: decal @@ -251,7 +251,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: diagonal_checker_b - type: decal diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml index 775b6182dd8..c464c70a15f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml @@ -5,7 +5,7 @@ suffix: Atmospherics components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/atmospherics.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi state: "assembly" - type: entity @@ -14,7 +14,7 @@ suffix: Atmospherics, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/atmospherics.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi state: "assembly" #Cargo @@ -24,7 +24,7 @@ suffix: Cargo components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/cargo.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/cargo.rsi state: "assembly" - type: entity @@ -33,7 +33,7 @@ suffix: Cargo, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/cargo.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/cargo.rsi state: "assembly" #Clockwork @@ -68,7 +68,7 @@ suffix: Command components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/command.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/command.rsi state: "assembly" - type: entity @@ -77,7 +77,7 @@ suffix: Command, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/command.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/command.rsi state: "assembly" #Engineering @@ -87,7 +87,7 @@ suffix: Engineering components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/engineering.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/engineering.rsi state: "assembly" - type: entity @@ -96,7 +96,7 @@ suffix: Engineering, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/engineering.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/engineering.rsi state: "assembly" #External @@ -106,7 +106,7 @@ suffix: External components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/external.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/external.rsi state: "assembly" - type: entity @@ -115,7 +115,7 @@ suffix: External, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/external.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/external.rsi state: "assembly" #Public (Glass Airlock) @@ -125,7 +125,7 @@ suffix: Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/glass.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/glass.rsi state: "assembly" #Freezer @@ -135,7 +135,7 @@ suffix: Freezer components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/freezer.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/freezer.rsi state: "assembly" #Maintenance @@ -145,7 +145,7 @@ suffix: Maintenance components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/maint.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/maint.rsi state: "assembly" - type: entity @@ -154,7 +154,7 @@ suffix: Maintenance, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/maint.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/maint.rsi state: "assembly" #Medical @@ -164,7 +164,7 @@ suffix: Medical components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/medical.rsi state: "assembly" - type: entity @@ -173,7 +173,7 @@ suffix: Medical, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/medical.rsi state: "assembly" #Science @@ -183,7 +183,7 @@ suffix: Science components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/science.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/science.rsi state: "assembly" - type: entity @@ -192,7 +192,7 @@ suffix: Science, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/science.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/science.rsi state: "assembly" #Security @@ -202,7 +202,7 @@ suffix: Security components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/security.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/security.rsi state: "assembly" - type: entity @@ -211,7 +211,7 @@ suffix: Security, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/security.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/security.rsi state: "assembly" #Shuttle @@ -221,7 +221,7 @@ suffix: Shuttle components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi state: "assembly" - type: entity @@ -230,7 +230,7 @@ suffix: Shuttle, Glass components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi state: "assembly" #Virology @@ -240,7 +240,7 @@ suffix: Virology components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/virology.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/virology.rsi state: "assembly" - type: entity @@ -249,7 +249,7 @@ suffix: Virology, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/virology.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/virology.rsi state: "assembly" #CentralCommand @@ -259,7 +259,7 @@ suffix: CentralCommand components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/centcomm.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi state: "assembly" - type: entity @@ -268,7 +268,7 @@ suffix: CentralCommand, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/centcomm.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi state: "assembly" #Mining @@ -297,7 +297,7 @@ suffix: Syndicate components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi state: "assembly" - type: entity @@ -306,7 +306,7 @@ suffix: Syndicate, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi state: "assembly" #ShuttleSyndicate @@ -316,7 +316,7 @@ suffix: ShuttleSyndicate components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi state: "assembly" - type: entity @@ -325,7 +325,7 @@ suffix: ShuttleSyndicate, Glass components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi state: "assembly" #High Security @@ -335,5 +335,5 @@ suffix: HighSec components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/highsec/highsec.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/highsec/highsec.rsi state: "assembly" diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 2c4f0f4ce73..3f8ada3bd8a 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -659,7 +659,7 @@ base: reinf_over - type: entity - parent: BaseWallDiagonal #DeltaV: Frontier Diagonal Walls port + parent: WallShuttleDiagonal id: WallReinforcedDiagonal name: reinforced wall suffix: diagonal @@ -670,14 +670,14 @@ components: - type: Sprite drawdepth: Walls - sprite: _NF/Structures/Walls/solid_reinforced_diagonal.rsi #DeltaV: Using Frontier sprites to go with the artstyle + sprite: Structures/Walls/reinforced_diagonal.rsi state: state0 - type: IconSmooth mode: Diagonal key: walls base: state - type: Icon - sprite: _NF/Structures/Walls/solid_reinforced_diagonal.rsi #DeltaV: Using Frontier sprites to go with the artstyle + sprite: Structures/Walls/reinforced_diagonal.rsi state: state0 # Riveting @@ -1027,7 +1027,7 @@ base: solid - type: entity - parent: BaseWallDiagonal #DeltaV: Frontier Diagonal Walls port + parent: WallShuttleDiagonal id: WallSolidDiagonal name: solid wall suffix: diagonal diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml deleted file mode 100644 index e6f0fae88cb..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml +++ /dev/null @@ -1,81 +0,0 @@ -#reinforced secret door -- type: entity - id: ReinforcedSecretDoorAssembly - name: secret reinforced door assembly - parent: BaseSecretDoorAssembly - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_reinforced.rsi - state: assembly - - type: Construction - graph: ReinforcedSecretDoorGraph - node: assembly - -- type: entity - id: SolidReinforcedSecretDoor - name: reinforced wall - parent: BaseSecretDoor - components: - - type: Construction - graph: ReinforcedSecretDoorGraph - node: ReinforcedSecretDoorNode - containers: - - battery-container - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_reinforced.rsi - -#wood secret door -- type: entity - id: WoodSecretDoorAssembly - name: secret wood door assembly - parent: BaseSecretDoorAssembly - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_wood.rsi - state: assembly - - type: Construction - graph: WoodSecretDoorGraph - node: assembly - placement: - mode: SnapgridCenter - -- type: entity - id: WoodSecretDoor - name: wood wall - parent: BaseSecretDoor - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_wood.rsi - - type: Construction - graph: WoodSecretDoorGraph - node: WoodSecretDoorNode - containers: - - battery-container - -#uranium secret door -- type: entity - id: UraniumSecretDoorAssembly - name: secret uranium door assembly - parent: BaseSecretDoorAssembly - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_uranium.rsi - state: assembly - - type: Construction - graph: UraniumSecretDoorGraph - node: assembly - placement: - mode: SnapgridCenter - -- type: entity - id: UraniumSecretDoor - name: uranium wall - parent: BaseSecretDoor - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_uranium.rsi - - type: Construction - graph: UraniumSecretDoorGraph - node: UraniumSecretDoorNode - containers: - - battery-container diff --git a/Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml b/Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml deleted file mode 100644 index 83528566b4f..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml +++ /dev/null @@ -1,118 +0,0 @@ -# Base Diagonal Wall -- type: entity - abstract: true - parent: BaseStructure - id: BaseWallDiagonal - name: basewall - suffix: diagonal - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Transform - anchored: true - - type: Clickable - - type: Tag - tags: - - Wall - - type: Sprite - drawdepth: Walls - state: state0 - - type: IconSmooth - mode: Diagonal - key: walls - base: state - - type: Icon - state: state0 - - type: Airtight - noAirWhenFullyAirBlocked: false - airBlockedDirection: - - South - - East - - type: Fixtures - fixtures: - fix1: - shape: - !type:PolygonShape - vertices: - - "-0.5,-0.5" - - "0.5,0.5" - - "0.5,-0.5" - mask: - - FullTileMask - layer: - - WallLayer - -# Wall variations -- type: entity - parent: [ WallWood, BaseWallDiagonal ] - id: WallWoodDiagonal - name: wood wall - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Sprite - drawdepth: Walls - sprite: _NF/Structures/Walls/wood_diagonal.rsi - state: state0 - - type: IconSmooth - mode: Diagonal - key: walls - base: state - - type: Icon - sprite: _NF/Structures/Walls/wood_diagonal.rsi - state: state0 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PolygonShape - vertices: - - "-0.5,-0.5" - - "0.5,0.5" - - "0.5,-0.5" - mask: - - FullTileMask - layer: - - WallLayer - - type: Occluder - enabled: false - -- type: entity - parent: [ WallUranium, BaseWallDiagonal ] - id: WallUraniumDiagonal - name: uranium wall - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Sprite - drawdepth: Walls - sprite: _NF/Structures/Walls/uranium_diagonal.rsi - state: state0 - - type: IconSmooth - mode: Diagonal - key: walls - base: state - - type: Icon - sprite: _NF/Structures/Walls/uranium_diagonal.rsi - state: state0 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PolygonShape - vertices: - - "-0.5,-0.5" - - "0.5,0.5" - - "0.5,-0.5" - mask: - - FullTileMask - layer: - - WallLayer - - type: Occluder - enabled: false diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/secretdoor.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/secretdoor.yml deleted file mode 100644 index b54c267ec00..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/secretdoor.yml +++ /dev/null @@ -1,251 +0,0 @@ -- type: constructionGraph - id: ReinforcedSecretDoorGraph - start: start - graph: - - node: start - edges: - - to: assembly - completed: - - !type:SetAnchor - value: false - steps: - - material: Steel - amount: 4 - doAfter: 4 - - material: Plasteel - amount: 4 - doAfter: 4 - - material: MetalRod - amount: 4 - doAfter: 4 - - node: assembly - entity: ReinforcedSecretDoorAssembly - actions: - - !type:SnapToGrid {} - - !type:SetAnchor {} - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - steps: - - material: Cable - amount: 4 - doAfter: 2.5 - - to: start - conditions: - - !type:EntityAnchored - anchored: false - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - - !type:SpawnPrototype - prototype: SheetPlasteel1 - amount: 2 - - !type:DeleteEntity {} - steps: - - tool: Welding - doAfter: 3 - - node: wired - entity: ReinforcedSecretDoorAssembly - edges: - - to: electronics - steps: - - component: PowerCell - name: power cell - store: battery-container - icon: - sprite: Objects/Power/power_cells.rsi - state: small - doAfter: 1 - - to: assembly - completed: - - !type:GivePrototype - prototype: CableApcStack1 - amount: 4 - steps: - - tool: Cutting - doAfter: 2 - - node: electronics - entity: ReinforcedSecretDoorAssembly - edges: - - to: ReinforcedSecretDoorNode - steps: - - tool: Screwing - doAfter: 2 - - node: ReinforcedSecretDoorNode - entity: SolidReinforcedSecretDoor - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - - !type:DoorWelded {} - completed: - - !type:EmptyAllContainers {} - steps: - - tool: Prying - doAfter: 5 - -- type: constructionGraph - id: WoodSecretDoorGraph - start: start - graph: - - node: start - edges: - - to: assembly - completed: - - !type:SetAnchor - value: false - steps: - - material: WoodPlank - amount: 4 - doAfter: 4 - - material: MetalRod - amount: 4 - doAfter: 4 - - node: assembly - entity: WoodSecretDoorAssembly - actions: - - !type:SnapToGrid {} - - !type:SetAnchor {} - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - steps: - - material: Cable - amount: 4 - doAfter: 2.5 - - to: start - conditions: - - !type:EntityAnchored - anchored: false - completed: - - !type:SpawnPrototype - prototype: MaterialWoodPlank1 - amount: 4 - - !type:DeleteEntity {} - steps: - - tool: Welding - doAfter: 3 - - node: wired - entity: WoodSecretDoorAssembly - edges: - - to: electronics - steps: - - component: PowerCell - name: power cell - store: battery-container - icon: - sprite: Objects/Power/power_cells.rsi - state: small - doAfter: 1 - - to: assembly - completed: - - !type:GivePrototype - prototype: CableApcStack1 - amount: 4 - steps: - - tool: Cutting - doAfter: 2 - - node: electronics - entity: WoodSecretDoorAssembly - edges: - - to: WoodSecretDoorNode - steps: - - tool: Screwing - doAfter: 2 - - node: WoodSecretDoorNode - entity: WoodSecretDoor - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - - !type:DoorWelded {} - completed: - - !type:EmptyAllContainers {} - steps: - - tool: Prying - doAfter: 5 - -- type: constructionGraph - id: UraniumSecretDoorGraph - start: start - graph: - - node: start - edges: - - to: assembly - completed: - - !type:SetAnchor - value: false - steps: - - material: Uranium - amount: 4 - doAfter: 4 - - material: MetalRod - amount: 4 - doAfter: 4 - - node: assembly - entity: UraniumSecretDoorAssembly - actions: - - !type:SnapToGrid {} - - !type:SetAnchor {} - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - steps: - - material: Cable - amount: 4 - doAfter: 2.5 - - to: start - conditions: - - !type:EntityAnchored - anchored: false - completed: - - !type:SpawnPrototype - prototype: SheetUranium1 - amount: 4 - - !type:DeleteEntity {} - steps: - - tool: Welding - doAfter: 3 - - node: wired - entity: UraniumSecretDoorAssembly - edges: - - to: electronics - steps: - - component: PowerCell - name: power cell - store: battery-container - icon: - sprite: Objects/Power/power_cells.rsi - state: small - doAfter: 1 - - to: assembly - completed: - - !type:GivePrototype - prototype: CableApcStack1 - amount: 4 - steps: - - tool: Cutting - doAfter: 2 - - node: electronics - entity: UraniumSecretDoorAssembly - edges: - - to: UraniumSecretDoorNode - steps: - - tool: Screwing - doAfter: 2 - - node: UraniumSecretDoorNode - entity: UraniumSecretDoor - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - - !type:DoorWelded {} - completed: - - !type:EmptyAllContainers {} - steps: - - tool: Prying - doAfter: 5 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/structures.yml b/Resources/Prototypes/_NF/Recipes/Construction/structures.yml deleted file mode 100644 index dd5fd22c6e7..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Construction/structures.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: construction - name: reinforced secret door - id: SolidReinforcedSecretDoorConstruction - graph: ReinforcedSecretDoorGraph - startNode: start - targetNode: ReinforcedSecretDoorNode - category: construction-category-structures - description: A secret door for the wall. - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: _NF/Structures/Doors/secret_door_reinforced.rsi - state: closed - conditions: - - !type:TileNotBlocked - -- type: construction - name: wood secret door - id: WoodSecretDoorConstruction - graph: WoodSecretDoorGraph - startNode: start - targetNode: WoodSecretDoorNode - category: construction-category-structures - description: A secret door for the wall. - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: _NF/Structures/Doors/secret_door_wood.rsi - state: closed - conditions: - - !type:TileNotBlocked - -- type: construction - name: uranium secret door - id: UraniumSecretDoorConstruction - graph: UraniumSecretDoorGraph - startNode: start - targetNode: UraniumSecretDoorNode - category: construction-category-structures - description: A secret door for the wall. - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: _NF/Structures/Doors/secret_door_uranium.rsi - state: closed - conditions: - - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNESW.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNESW.png deleted file mode 100644 index 845f5b424b9b62db70d1e3ccb2cf3005a1bad495..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUKYsY|;>C-%uUgz3&Eh87{Nf_tn%47KNGc6cAi>FM3^CE<&}858{m zg$5B(3H@#nLt{mW9~VS9au(lm{_?<``JIeu-c2vY<@XK*uc*k7zn}Gm$9rQ+PNn?) zt{V(C^^Cj<`pp~rSgLaR=9(C6`0rc8?Ao>C`JFnZ5Yf;44zrIuD?IsBOtWZ`WzJnC nciGhe2UgbBynb9C@tWy;iD194{1ri4XIM?asQZe-jQzRP9m}?j}ez4oi$gqFm`-r`d|uX7y1|f%VOJ?^_Hpbx6ty|&BZxDw=#IT`njxg HN@xNAB;Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1HVZ`K~z{rrIyQ1 z+&~aT?FKST2#+NaLhwJcVNX6H5{kqIMG+gM2q_!>Ane)jH!NT=h$V!_5Dkper{wF@ z^w?%5T*M%l{p za<;O%nqOUA71j~45XXL8T&%{{0Um&#t*xy*tgfx)-Drd{jz!KJ$QeS^2Kl#x10&zw z-p;MD#8V7LqEpD8_s`?w{QCO32p1O@qf`Vcy$FC~@M&qu$iM9E6^qg4=H{jnq39l- zp6u;`F9its*ZuusFc@TEettfWA_^}8;EZ$<4de()$%THuKOus*k2oc#KXPXQLO$w5 zKrC|FJ$agDF9IU!Nu+h;0G^-^L|k58j){PH8gj;fG!tG#9XT)oKn-35Xd+K59T7Ok z-iz?$%(=!2IjYNV1B1v0PFSM9PEYe*uUE}E0#b5F0FIx_V#OXY=jZ47&d!cS{_^sY zbvhl(j4&ZU1H0YsaARZR1O2qM2>=qoSV81`t6iBE{z-|@ph%uUP6V+n$B4)vN!PiL z-jkE|&%3)tTsbx!BGxnrl>o2s$I+3ckEr8+B|`8bAV!2z4Q6VoB28kB?(Z%onRfM1f->@{^O3 zjCC%Ow&PS4U+!**D9+B#tlA+5`0+?Hi4Vra4K9y1g;hHpifESeoOOj&wG;;I~bXu5%BJ^(O6XGP0Lrk!!4o@u@c5ClDXrd!BQOrXuj;MF0W=asJ27 z7OR-_6w_M{>d5J*ig{8Ifc|Oj6IIE25jbH!MOsG=s2iRp5fF>K=~OiVDws4AUPK+a zAQAp3#sv_JuzHV3gczd?> kE|O{Q6Pufx(Y{~&1>8YSGf3@dLI3~&07*qoM6N<$f;sr^7ytkO diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png deleted file mode 100644 index 8d55de009e01dee3c8547f314d7996328ad260f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1120 zcmV-m1fTnfP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1NBKnK~z{ry_P*| z6j2n0@62w@hl!9nO^OK7LOcBnfi$U15iy0^3W6wUq68a31VQpY(&Rsgzd$fWnuSye zn{1NJ$7Vdwb>8tf&a7qyUl?ZQ-h0mbo^#LrNPR4$e%xZ7H&;Vg)4J@VGbINM(FqZQ5ZPs_2PT-=FRYC zeLXyX@gf@=8w-1Td)dcNpTfrvAEF)TnvgQ^g>T-BeYv)lomx<7v)N2cM0A2--bg=rJ{y>+z356!p?Fs zfQXrynP_ig0)8O{Rpfv%O?`mf-Q8?>4ERle29A%9UsyVC&`;YS0YD;@Vz9lvoj}gF+Le0Yrxb$*8F_#_Z%Z&DGDs*) zUjsgRPi|>X9vLt#%doVBCR7QGNM$)dJ(cA>Z-^gXFLyJe4U6C0vaHo+=R{@7jUmmzXbBi9nzik!)^mvd#+< z$g7qaP{nI^GY8q$)>f=`$N_#l%9+HDG3>5plcnFjevKVoc^xp+{th6Qy>FLL!Dj-H z34nd$^OrAJga;2F{zxyIknL7|=TN{gmlocZ_VBdT${sB*Z}cqsg@uLCJ3EWx@WU8_ z!cWuwdCqgy+2u9&C-88&&x+SWAGypLfw5L9!BL;EM~%-sOYN5>8FZ8)lp9W zUMEr?d-^1J|iVPrvUG2K(xqt}7UH3kb zP=rJXBm(^Hd0vJ@diz25iReiYNeCbkk>^d?I`hA3Fb1KzXL$Q6q&|AhFR--#)p_nA zd+rn3-mPumeIg!4bX1*c6w#og)I;Qq5jknkYoqo)5%XD&+^=QuClOWTo=_t4-w53& z(tkbA>&VG0QL4UZlL*klRu%Y|GWoev;SOFVhhPh;Mp0J8lR70000C-{j~_pM`t<$Vw;w-z0Lqvw(#i)?>?J{d!T-U4LCTxi z4JgD};1OBOz`%DHgc*0=R~xvc)nmuNcNP52iw&*7L>ZOF#Ml+ z$M`Mjb{O)6_a%EZA?UePqTw0Un|4 zp7T4oSPrdV*t5gNmH*X2d*&tc9lT;pH?8q>XpDY;`;C0i-S%${wg(!e4K76O)?jBi zz^(gBSmA)qLe2{QIW3K^jkvCQJ3LfdA>QC#b>J_1A@jzm<_`Sp6jT`QU)#YwBc*Q@ zw?n4Sjd(`i#9C$(%V-~dm5QCS78N>cFYv9p$+RISzk17uRkeJLGrzA2f7`hJ{lf3^ Y&t$os=O>;&4h%5{Pgg&ebxsLQ0N;qPGynhq diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay.png deleted file mode 100644 index ce50ddfca4df3dfdee095834172bce721277f060..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUpFVy1@xzC=uU@@)@#6j4w~rq`2Fe6pj+X~g>?J{d!T-U4LCTxi z4JgD};1OBOz`%DHgc*-0rX%OgX_8(ZF)% zorXKp^hPD6n%TE%*~&N)>I}8tgu5`Ra7}dnJy)0M^+}iPIKI8h%ygFVoty9~lbyj< zqp@nDZHwfL#@P%P$`A0&-{tp^v!QkIoBcbcPOJaIbcx$xru^bJ0ylgk6b}I%%;4$j K=d#Wzp$PyA+IztO diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png deleted file mode 100644 index b3fdf5edab3c15e16c25d22e17a844f5f742588a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STpFVy1_SLHwFJ3%;{P@nDI}aW_c>ne-P|}QX8%PaDNswRge+Xc> z*St3pD8^af5n0T@z;_sg8IR|$NC67Y@N{tuvG9L8DVy)G0#CD|!_NP`&yQ;~g+5}K zTYvFMvqf02{R{qxd`7dktToT)C9w?n4yjd;e~#JP;K<|r>?7h)8?wa93p zXuu@CXof>&w~|{Hf3p=yyC1mz7WeZ13%~Q591+UXs9LoW=tc%lS3j3^P6y diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png deleted file mode 100644 index ddbc67b6dfeb15e88a0ee8d1bf6ddf92c25ebd34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STpFVy1_SLHwFJ8QV`}XnU$3WrMMQxfuimfEbFZe$QFl^qxWIs@Z zv%n*=n1O-sFbFdq&tH)O6kP4;;uvD#KXp>H&|w1(X2Z_+^-sIpy&o;8Smht#kZ^j@ zPOlV)RWsi=By&q7_5@4nB_5f0LW1Xn3G*sO$-v52ij40LR`1Cbe5x1I_8VWAdEcsh-#H%4_ZkKxZ>} My85}Sb4q9e03A+!N&o-= diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png deleted file mode 100644 index 93fced6eed408b96baaa7315db110d5c8d4b4bca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUKYsY|;>C-%uUsWzg9i_Q@*CNFR{$x_k|4j} z|4_gX>|Y@S5-jkDEM{QfI}E~%$MaXD00p;rx;Tbd_|Lu6%XL_Rhvh-mqw~M*KfVhI zTQgm>Y)$F|_nwX6^-peH_Mb3e&c_GpjfUqOv>upoD`+fiD9)Y0uq5b|ie6*nx$Yfr z4&FFyaMXsuxq(HrVo#)s#WNd4o?jP4Il>n2YTw8nFSVoiO2pGJt~ZtkjoBr>SGYGs zWhXz|s(m1I5yzHos~%gtWqpv(a7jACrTN$0LyNdR&;BQWC%VP9z`>re&35@(M*ZZq huLIv(9-Md2{=TC4-i0jfSAgzk@O1TaS?83{1OR=^lR^Lh diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/meta.json b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/meta.json deleted file mode 100644 index 9d2204a0708..00000000000 --- a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/meta.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-SA-3.0", - "copyright": "mirrorcult, texturized by aexxie, diagonal / quartertile / halftile / fulltile / checker modified by Adeinitas of Delta-V to go with the paradise artstyle", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "fulltile_overlay" - }, - { - "name": "halftile_overlay" - }, - { - "name": "halftile_overlay_90" - }, - { - "name": "halftile_overlay_180" - }, - { - "name": "halftile_overlay_270" - }, - { - "name": "quartertile_overlay" - }, - { - "name": "quartertile_overlay_90" - }, - { - "name": "quartertile_overlay_180" - }, - { - "name": "quartertile_overlay_270" - }, - { - "name": "threequartertile_overlay" - }, - { - "name": "threequartertile_overlay_90" - }, - { - "name": "threequartertile_overlay_180" - }, - { - "name": "threequartertile_overlay_270" - }, - { - "name": "checkerNESW" - }, - { - "name": "checkerNWSE" - }, - { - "name": "diagonal" - }, - { - "name": "diagonal_checker_a" - }, - { - "name": "diagonal_checker_b" - } - ] - } - \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay.png deleted file mode 100644 index 866343f5dca1853107d678c0f49fc578bf53bec6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STpFVy1_SLHwFJ8QV`}XnU$3WrMMQxfuimfEbFZe$QFl^qxWIs@Z zv%n*=n1O-sFbFdq&tH)O6ioGWaSXBWe>>rz-~j~=7Dwm*y3a4no}lO`T`+$G`wA5u zzopr0I0fOH~;_u diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png deleted file mode 100644 index 516b0765294dfb17f4f12a98dcbd0fc5d303c7de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STpFVwh=gyr64<0;z{P@L-7eL`dKToj(DYlXzzu^BMz_5A$lKnst z&H|6fVg?4j!ywFfJby(BP%z%p#WBRf|LsL@z5@yzECF^;|Ans;_LL5q(CTfiEgXNK zC&jnUpjd0c3>JgU3SCPWwmXOle0=Gm#Vc`~DMq$n5_4TxhN+|Z!QG2$n7N{w0>9;0 lv;W}Pe|~k}&nAh@()k|*Qp5@l*8{C$@O1TaS?83{1ORpPSpNV3 diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png deleted file mode 100644 index 4b1071b67eff41a3a1a95b212573773c0360db64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STpFVy1_SLHwFJ3%;{P_Lbw?JV&KGA9*#a0sJ7yKUt7&h-;vL7hI zS>O>_43s|%!i>lBSEK+1b39!fLoEE?PITlupuoYBsQv$ckzh`TSXNcu^BsOAj+1!z zKd5nykSKIGa)v?HP3r*5rNfWd3SN7;uN7q1a$sF7Ao14do0DPd-0bV=3xj)qI-T&| yG__@##C-%uUE?L_hrZ&tr;P^N~I6R@|L~ z7tHE2tDkXN8L`FL2uVEVS;CZO%5ac_bxyjc-U4?Q!RZHbdR$}549Yx&pNUUkdScZ0 z`s#$!v$iVoRK4J2S-s-jgz^uI8?Eb2{VJz2Rr`H7&pefVhNb-*Z4ti*7gZF14q)(f L^>bP0l+XkK=L2TZ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png deleted file mode 100644 index 449069e70db6eddea7d9131cfc0db37ec99fac73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUpFVy1@xzC=uU@@)@#6j4w~rq`2Fe6pj+X~g>?J{d!T-U4LCTxi z4JgD};1OBOz`%DHgc*hCCPt@2(y>g69$n5JXiKG zx-%X=pc$pzo*9#UftUFde_FnwH=_fKfc295H(isf%?f89R=i!(o={LA_R{*Lg95i` zgZ;MU5zR#(QX9UAc05>7=;hDEHK!_nbG^qt@ze?r(*;cGGniJis{Rt5!90)IIx~1d zkC-%uUsWzg9i_Q@*CNFR{$x_k|4j} z|4_gX>|Y@S5-jkDEM{QfI}E~%$MaXD00rNBx;Tbd__t2t=4&?Kac*2P|M&cgvX~WI zE7N$*E^a^KXYtGX_^N-belKyc~Hd?u~Hp)i}PXSves8D1Q0cAvOd+AiL4{_;SV{f=eUoK2x@Yko21FMPDfZeKp5 zgL*`lYVzs3*=u_*F&|}nP{qpeVaf%T3DXZousdWsDP}Xy*=Si-#r(sQ|Hgj>IR@S0 z2DuQ$35*w*U)^`8jk>`UASnDTTp`HgKjW-9y35#wV)B-(m~(;ah>GbO27?^m-+2oI pU)M)mv$?(^ymq_gwS9r_?T>j0+pL$DDXH7vc9W->^UommHp(Y z>vb7Yo|A8_nZl=${{BDnIbDaQp1?T1#3L_H6s}>&U*E7J!BFX!H$UGR+Z(d+(Jy|q zvkO@8B{6<@BfE6Ev&2T`pj~pGieA*FOuGB~Ld*nqiwg{5UYb*b7#Y4Tb~PzIbgP9a zfbULAYgDUKxT(T-jd%vTmx{-mUp6fN#P-6`T;fr~zp($}1}Ei8c^Oi(5B=k~A$Cb_ z!AS{0IgbyHH^f>wdmB_&Zs2ve;kCOz;EGkd(-+aND|T+E=3o1lVe4YvF5f-xKLLHn N;OXk;vd$@?2>{gnn#uqG diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png deleted file mode 100644 index 4d786df12af9c6acff42d672641f62f15c081989..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUpFVy1@xzC=uU@@)@#6j4w~rq`zH{f!g9i_Q^6iuDbb%CSNswRg ze<)xG_OB2E2^M%n7BevL9R^{> zgrXR?wps65Z_i+(*Kp&M6h{i5jP0T|GJov<+8ZcMvn_CpXVkg9-Io1_(IUI}ud(?L c)?KsX^%B^0eMZ1mpl2C8UHx3vIVCg!0OUQMM*si- diff --git a/Resources/Textures/DeltaV/Tiles/attributions.yml b/Resources/Textures/DeltaV/Tiles/attributions.yml index 343e8e95232..0e0fc5cfa1c 100644 --- a/Resources/Textures/DeltaV/Tiles/attributions.yml +++ b/Resources/Textures/DeltaV/Tiles/attributions.yml @@ -23,7 +23,7 @@ - files: ["wood.png"] license: "CC-BY-SA-3.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. Modified by Aikakakah." + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise/" - files: ["super_reinforced.png"] @@ -53,15 +53,15 @@ - files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"] license: "CC-BY-SA-3.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. wood_tile Modified by Aikakakah." + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise/" - files: ["wood_broken.png"] license: "CC-BY-SA-3.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. Modified by Aikakakah" + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise" - files: ["wood_large.png"] license: "CC0-1.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. Modified by Aikakakah" + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise/" diff --git a/Resources/Textures/DeltaV/Tiles/wood.png b/Resources/Textures/DeltaV/Tiles/wood.png index 97bc02093b76430f8cb3a5751c9b8209df9945e3..56e745a42cb0f3c2825c2fda084714d404c83363 100644 GIT binary patch delta 1408 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 X$`uw6uO}3700000NkvXXu0mjfLdQnY delta 1624 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 delta 970 zcmV;*12z1?fC2LdkT`z>i%CR5RCr$PTg`40F%Wi$o1~OdrKm!xkaz&DyaDeoP8_L( zgjDqaRcUCKkPtF!&F-w%#3^N|LS+x#{sVKFkkS;lfTYUJe@<8_gHP~Pxub|q49quYY_Z)^W@0C-T)`_ zX_gLdHh=f?x^v<5+b5cPhoFK#p8WOQYFnG?)VAIjGjBJS^52{usUP>SS^7=z$CbZ+ zdw$et#dT7-jZv*93X})UHxD)hC?B3+qHrws1%F)mHx2|915YGzA*(RcX1eRtb8|Vu zC-}y7KDGQc`d@!|{{FL7V6I~tEY!GxzW=h7>|^!HSR z0M|U*MbN(Bk1PKU2M8&>`+cfze!7XBix^V3LM;O20D_+)fnnqyj6nGK0JR)+>8?4s z!5+bP-?l*BL&#rWF6Zj*VZ&}c-yNOC0k{($+S7tRuKa)X=dUYvC;60Ta{#>7g%l3o zDF+bzapj-Q0Wb~_6FZ<|?D4rAK=4f*rd0kt4iFmyfD`ZXL7e}`_aQDI_`J`j)^#ZP z_c%aGTpl>UyVFIpE?56#K5Oo|SF37&-!*+`F#dA+vco|HKRz!og#0HT-=FU|HW|wS zU_RvpIsJba?m)+s;@R_`E51H^)$TZ7J|9doe8>F%@je0wJ_zO;vu^L)a3A6bfkW{S&$q`z4Pbvx%dIC6{I0%AHd?x$yJ6v-A5Ywe6rRhy%ppfwJlP1b-O$H}ygQrTO(#BUXwh`TX{pm}5y%e*Xb`dkXK{ sv{tYH000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f)4oU!2kdN diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png deleted file mode 100644 index c5e502d1f9d0d259037cd2483eb9e879e789e57d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 812 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 diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/meta.json deleted file mode 100644 index c1f0d5e09ec..00000000000 --- a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "closed", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "closing", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "opening", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png deleted file mode 100644 index 71f56ae15b103b9411622f003da07a1fbf1fb5a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 737 zcmV<70v`Q|P)EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7iW07{H*!Og)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I5bWxZDB4Pr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMX%TXxQ&x-r00006VoOIv02%-q02)8Q>wo|N010qNS#tmY z4#NNd4#NS*Z>VGd000McNliru=L{GWBN!nf_iz9J0NzPNK~z}7?N>VvgD?zzL>Ukn zEk^FZ{ZGLi7*R%B+1e>cw5~eYu2kL>IfGxE=ijid>jPh~ZQB4NWFk^8m>B@jT7xBW ztyR4sqLYLvfpHw)jHMLRT0unS5lEVIkC&?iyq#YNL^ub4TuQm9-WzF}CPX5M2qH-& z&1ju^7Y+2oJkJ0C5jpEXSOi?Npda>qN3V*WU+_B-SeE71z^#El*T8WcA*EQ2fHtO? zwqp^AZO5VW05gM`(I=y@c_4~JdfkS+NhED0^CXeAoNul9t!CerQ*#1dHUATy-PvzO TIXuS500000NkvXXu0mjfM$$ZJ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png deleted file mode 100644 index 8d14635c6def566d83bacd7dda162408e1f36bde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9097 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 VYCJU_KA;N^Fw`~G$=7xY{V&IZ7jpmr diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png deleted file mode 100644 index a32da6cdb7ca9f577087a47ee19c94e8c4462e65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1113 zcmV-f1g86mP)EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7iW07{H*!Og)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I5bWxZDB4Pr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMX%TXxQ&x-r00006VoOIv02%-q02)8Q>wo|N010qNS#tmY z4#NNd4#NS*Z>VGd000McNliru=L{GX01j%MUv~fi0#->xK~z}7)mJ@C+dvq7iM+9~ z6qP0CHIg?Zx=__w5dnl+38@3>5Gf=y5$e#TLzfN}jYXnJnL2brs-TIol8UPIM^zVB zkr>b!1`6%KmVt>5=)0aB49WQ{#JBm*=X-wl-TU5`n3#NU4u$x8eC&HZJlspDe8*s> zsj?2V?)&a8qD11$&tH8EjNiQzy5Q*d9{|A9h;}=Kqerv-wo-gE3uQhOg>RxmJuh(9MPS$G;0KmfBBOi#d(GlnhW9QRX z-$1+B0%NHQ2D}3>mV%wJ1qj+)+Yz*zE#JU&b_M`YtvLVhyaeL&P8&MIpmV06jp=&P zJh7rX3;?h*HUOZr-9fQj5!`Im(N;BZ(W1WSIQQi5V*ZSqD7MMMBbb zoX*Z5C{|jPQ2y&s_Y)#QR~Z*&A(Ew-nI@_gC)R}Q6QZCLlMd8tjcb|GVoHO>h?!<= zbpQa2pvX`;wllUU$HY?5m}mhIbT#rb84`K(lhYo?Mn}+fT|JKI+3NG5EgAVkEeyPS zyFQdDC1%o=rKcDT`XX5|*_LZz;Kj=~11VgvF-cpN=#GMY;;m}U5)T)joJXOMnp5T8 fP*vTc&@RV6FV7d1%W9L+00000NkvXXu0mjfzajBu diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png deleted file mode 100644 index 680aee0efdd123e32715de1c6b3d8e5ee692c42e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 750 zcmVEX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7iW07{H*!Og)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I5bWxZDB4Pr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMX%TXxQ&x-r00006VoOIv02%-q02)8Q>wo|N010qNS#tmY z4#NNd4#NS*Z>VGd000McNliru=L{GX0TubGpJ{Le6efJISB zX&~)qU_5sAGCTyNrNoKS^z_+Ftm5S8XDqL7{?EX`z@V+CN0Q60Ub=+BCs#k?&!1lh zGz~B@3@~5}i%KRt1QZn&81CPHz(9$97DYt`xIk7;I)j7|H;SSc@4jNy3{zLv)JKti zcnJ9T`{7Jr=m0svZP~bqffD^F*>FJ8z<`&8PR>pY`}Xc*AhkrifA1cHld}^80|Ns^ z`WZ)jT`=GU(WnDP9l&z`-o1f!z=$u12EH;H@ah=WC>`(y$v`#9Mq9-!us9sBj>&*` g%_vEP!=f$#0D|n4jy&*8T>t<807*qoM6N<$g2HS`YXATM diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png deleted file mode 100644 index 916e062da27c473109645435f0d90fff32582db6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17280 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 diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png deleted file mode 100644 index 29f1e96e76f00a04adc4b6dc158bbf52b1ac47c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14336 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 R_#G00s-l)cm7G=B{{rt|&eH$@ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png deleted file mode 100644 index 0c3c643ed22344d3061f24945255ff5f68c58e53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 770 zcmV+d1O5DoP)EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7iW07{H*!Og)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I5bWxZDB4Pr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMX%TXxQ&x-r00006VoOIv02%-q02)8Q>wo|N010qNS#tmY z4#NNd4#NS*Z>VGd000McNliru=L{GWD=^$n)q(&30RKruK~z}7?UzjsfbZ6kN^_5OgB zZ2_gwLH-JC*Gni%Mhj3dzH*9y3IUvxaxiEY+WPu{>-0CUyr}i|0e8_|+Wc98ZkaH# zW`O?%pc+Qf0K8Ll{sTV`fMayKet@E$7NBp^jRK%+&XXIGE=#8D2ShB^H$SNC2Phpb z*<$j!gy@_For?+81%m+18_F)I%Ac@FpqfZlZ@i*u6bA76hX4Qo07*qoM6N<$f_scj ANdN!< diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closed.png deleted file mode 100644 index 5ff2725b0fe1e1b63d3e245e9beae46b4c26daed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 700 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 CJo0J) diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/meta.json deleted file mode 100644 index c1f0d5e09ec..00000000000 --- a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "closed", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "closing", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "opening", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png deleted file mode 100644 index 4c56ed292e6fd25bd78fac01ee78bf1a35259b5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 721 zcmV;?0xtcDP)EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UWP&La) z#baVNw<`9$B7iW07{H*!Og)ia%)oPe-NVP%yC~1{KKJM7SMnwUd?N82(+!JwgLr1s z(mC%FhgeBch|h_~4Z0xlBiCh@-#8Z?7I5bWxZDB4Pr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM> zj1?(+-Q(T8oxS~grq$mMX%TXxQ&x-r00006VoOIv02%-q02)8Q>wo|N010qNS#tmY z4#NNd4#NS*Z>VGd000McNliru=L{GWD<&wKVAB8q0M1E7K~z}7?Uzjo!Y~kpU#CMX zV$tfN;1#_8QM`iS!apifLmFLG6m48(1~CspNM+Mmhkk^UxH9f)aHg2oNe#A^_@FkO2M{K*|RO0VEwUy@3Rf0H|PH25Oy0>pYI< zt4=>)t%J1=W0R}&11#MIzX5zIyOLhOlF5GWb1I=b09i&Daf-*E00000NkvXXu0mjf Db090y diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png deleted file mode 100644 index 9bb4c9e4512dec932b9e3eb00c250b1b6f484590..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9585 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 diff --git a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/meta.json b/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/meta.json deleted file mode 100644 index 30760f072aa..00000000000 --- a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server", - "states": [ - { - "name": "state0" - }, - { - "name": "state1" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state0.png b/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state0.png deleted file mode 100644 index d437ad8b738db68616d680dd195f849583138cf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5943 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 HMVbEwwkFzU diff --git a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state1.png b/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state1.png deleted file mode 100644 index a0ce5d516e8da1f72bed5c044fcf8019a2aac9c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5829 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 From b56a6677bef96d54ed8617af2a0fe900f2349019 Mon Sep 17 00:00:00 2001 From: Milon Date: Sat, 28 Sep 2024 19:22:40 +0200 Subject: [PATCH 021/561] change pai wipe text (#1928) siiiigh --- Resources/Locale/en-US/deltav/pai/pai-system.ftl | 1 + Resources/Locale/en-US/pai/pai-system.ftl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/deltav/pai/pai-system.ftl diff --git a/Resources/Locale/en-US/deltav/pai/pai-system.ftl b/Resources/Locale/en-US/deltav/pai/pai-system.ftl new file mode 100644 index 00000000000..8c19c937f56 --- /dev/null +++ b/Resources/Locale/en-US/deltav/pai/pai-system.ftl @@ -0,0 +1 @@ +pai-system-wipe-device-verb-text = Return pAI to Server diff --git a/Resources/Locale/en-US/pai/pai-system.ftl b/Resources/Locale/en-US/pai/pai-system.ftl index d64d7f56234..eef3aae60b8 100644 --- a/Resources/Locale/en-US/pai/pai-system.ftl +++ b/Resources/Locale/en-US/pai/pai-system.ftl @@ -12,7 +12,7 @@ pai-system-role-description-syndicate = Be someone's Syndicate pal! pai-system-role-name-potato = potato artificial intelligence pai-system-role-description-potato = It's a toy for children. And now you live in it. -pai-system-wipe-device-verb-text = Remove pAI +# pai-system-wipe-device-verb-text = Remove pAI # See DeltaV/pai/pai-system.ftl pai-system-wiped-device = The pAI was wiped from the device. pai-system-stop-searching-verb-text = Stop searching From e56c97ec9b647c5ebd4294045aec36b0bfdf9b84 Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Sun, 29 Sep 2024 04:33:59 +1000 Subject: [PATCH 022/561] Revert "change pai wipe text (#1928)" (#1929) This reverts commit b56a6677bef96d54ed8617af2a0fe900f2349019. --- Resources/Locale/en-US/deltav/pai/pai-system.ftl | 1 - Resources/Locale/en-US/pai/pai-system.ftl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 Resources/Locale/en-US/deltav/pai/pai-system.ftl diff --git a/Resources/Locale/en-US/deltav/pai/pai-system.ftl b/Resources/Locale/en-US/deltav/pai/pai-system.ftl deleted file mode 100644 index 8c19c937f56..00000000000 --- a/Resources/Locale/en-US/deltav/pai/pai-system.ftl +++ /dev/null @@ -1 +0,0 @@ -pai-system-wipe-device-verb-text = Return pAI to Server diff --git a/Resources/Locale/en-US/pai/pai-system.ftl b/Resources/Locale/en-US/pai/pai-system.ftl index eef3aae60b8..d64d7f56234 100644 --- a/Resources/Locale/en-US/pai/pai-system.ftl +++ b/Resources/Locale/en-US/pai/pai-system.ftl @@ -12,7 +12,7 @@ pai-system-role-description-syndicate = Be someone's Syndicate pal! pai-system-role-name-potato = potato artificial intelligence pai-system-role-description-potato = It's a toy for children. And now you live in it. -# pai-system-wipe-device-verb-text = Remove pAI # See DeltaV/pai/pai-system.ftl +pai-system-wipe-device-verb-text = Remove pAI pai-system-wiped-device = The pAI was wiped from the device. pai-system-stop-searching-verb-text = Stop searching From af62fc3169d22db11e8a547db84b8acd9ac64709 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sat, 28 Sep 2024 14:47:15 -0500 Subject: [PATCH 023/561] Map Edits: Hammurabi (#1922) * Map Edits: Hammurabi * Update some evidence lockers to have lawyer access --------- Co-authored-by: Velcroboy --- Resources/Maps/hammurabi.yml | 3399 +++++++++++++++++++++------------- 1 file changed, 2112 insertions(+), 1287 deletions(-) diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 0d4c80a132a..afe6e3c6d38 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -123,7 +123,7 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAXgAAAAACfwAAAAAAZQAAAAAAXgAAAAACXgAAAAACXgAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAACZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAACXgAAAAACUgAAAAAAUgAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAXgAAAAADZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAADXgAAAAACfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbwAAAAACQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAABXgAAAAADXgAAAAACXgAAAAABXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAABXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAABXgAAAAACXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAABQwAAAAAAQwAAAAAAXgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABXgAAAAADXgAAAAADUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAXgAAAAACfwAAAAAAZQAAAAAAXgAAAAACXgAAAAACXgAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAACZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAACXgAAAAACUgAAAAAAUgAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAXgAAAAADZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAADXgAAAAACfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbwAAAAACQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAABXgAAAAADXgAAAAACXgAAAAABXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAABXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAABXgAAAAACXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAABQwAAAAAAQwAAAAAAXgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABXgAAAAADXgAAAAADUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,1: ind: -1,1 @@ -391,7 +391,7 @@ entities: version: 6 -1,2: ind: -1,2 - tiles: fQAAAAABfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfQAAAAACfQAAAAACfQAAAAABfQAAAAACfQAAAAABfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfQAAAAABUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAaQAAAAABaQAAAAACaQAAAAABaQAAAAABaQAAAAADaQAAAAABaQAAAAADaQAAAAAAaQAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAAAaQAAAAACaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAACUAAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAUAAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAACaQAAAAACaQAAAAACaQAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAADfwAAAAAAaQAAAAACaQAAAAABaQAAAAABaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAIAAAAAABIAAAAAADIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fQAAAAABfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfQAAAAACfQAAAAACfQAAAAABfQAAAAACfQAAAAABfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfQAAAAABUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAaQAAAAABaQAAAAACaQAAAAABaQAAAAABaQAAAAADaQAAAAABaQAAAAADaQAAAAAAaQAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAAAaQAAAAACaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAACUAAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAUAAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAACaQAAAAACaQAAAAACaQAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAADfwAAAAAAaQAAAAACaQAAAAABaQAAAAABaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAIAAAAAABIAAAAAADIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -5,2: ind: -5,2 @@ -439,7 +439,7 @@ entities: version: 6 3,-4: ind: 3,-4 - tiles: bQAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACUAAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAACUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAADXgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAABXgAAAAACUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXgAAAAADUAAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAABQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAADbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAACbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAA + tiles: bQAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACUAAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAACUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAADXgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAABXgAAAAACUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXgAAAAADUAAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAABQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAADbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAACbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAA version: 6 -3,-6: ind: -3,-6 @@ -451,7 +451,7 @@ entities: version: 6 3,-3: ind: 3,-3 - tiles: fwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,-2: ind: 3,-2 @@ -475,7 +475,7 @@ entities: version: 6 -8,-2: ind: -8,-2 - tiles: QwAAAAAABQAAAAAJQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAIQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAZwAAAAAAZwAAAAAAZwAAAAABZwAAAAACZwAAAAAAZwAAAAAAZwAAAAADZwAAAAABZwAAAAADZwAAAAABBQAAAAAFBQAAAAABBQAAAAAOBQAAAAACBQAAAAANfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAGQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAQwAAAAAABQAAAAAMQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAZwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAZwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAA + tiles: QwAAAAAABQAAAAAJQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAIQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAZwAAAAAAZwAAAAAAZwAAAAABZwAAAAACZwAAAAAAZwAAAAAAZwAAAAADZwAAAAABZwAAAAADZwAAAAABBQAAAAAFBQAAAAABBQAAAAAOBQAAAAACBQAAAAANfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAGQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAQwAAAAAABQAAAAAMQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAZwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAZwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAA version: 6 -5,-6: ind: -5,-6 @@ -535,7 +535,7 @@ entities: version: 6 -9,-3: ind: -9,-3 - tiles: fgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAADfwAAAAAAXgAAAAACfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAAAfwAAAAAAXgAAAAABfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAABXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA + tiles: fgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAADfwAAAAAAXgAAAAACfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAAAfwAAAAAAXgAAAAABfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAABXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA version: 6 -8,-4: ind: -8,-4 @@ -1054,6 +1054,8 @@ entities: 6995: 19,-3 6996: 19,0 6997: 19,2 + 9471: -6,50 + 9472: -2,48 - node: angle: 1.5707963267948966 rad color: '#52B4E9FF' @@ -3933,6 +3935,12 @@ entities: id: Clandestine decals: 5978: -49.234955,-76.92839 + - node: + color: '#A4610696' + id: Delivery + decals: + 9463: -7,47 + 9464: -7,47 - node: color: '#FFFFFFFF' id: Delivery @@ -3961,6 +3969,7 @@ entities: 6349: 81,-52 6350: 81,-44 6351: 73,-44 + 9462: -10,23 - node: cleanable: True color: '#D5188DFF' @@ -12273,6 +12282,9 @@ entities: 7070: 36,1 7071: 36,2 7084: -8,43 + 9468: -7,50 + 9469: -7,49 + 9470: -7,48 - node: color: '#1D1D21FF' id: WarnLineGreyscaleE @@ -12469,6 +12481,9 @@ entities: 7057: 37,27 7059: 42,-3 7073: 36,2 + 9465: -7,50 + 9466: -7,49 + 9467: -7,48 - node: color: '#A46106DD' id: WarnLineW @@ -13724,7 +13739,7 @@ entities: -9,-12: 0: 53503 -8,-11: - 0: 64733 + 0: 64735 -9,-11: 0: 55773 -8,-10: @@ -14334,8 +14349,7 @@ entities: -14,-12: 0: 61412 -14,-11: - 0: 53212 - 4: 4096 + 0: 57308 -14,-10: 0: 57308 -14,-13: @@ -15528,7 +15542,8 @@ entities: -2,10: 0: 65535 -2,11: - 2: 63200 + 2: 55008 + 0: 8192 -2,12: 0: 36863 2: 12288 @@ -15916,7 +15931,7 @@ entities: 2: 3824 14,-15: 2: 13056 - 0: 32768 + 0: 34816 14,-14: 0: 16379 14,-13: @@ -15926,7 +15941,7 @@ entities: 15,-16: 2: 20208 15,-15: - 0: 47104 + 0: 47872 2: 12 15,-14: 0: 35839 @@ -16110,7 +16125,7 @@ entities: -32,-6: 0: 2184 -31,-8: - 0: 56785 + 0: 57297 -31,-7: 0: 64973 -31,-6: @@ -16153,7 +16168,7 @@ entities: -28,-17: 0: 65391 -28,-15: - 7: 7 + 4: 7 3: 1792 -28,-14: 3: 7 @@ -17067,28 +17082,13 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.14975 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 293.15 moles: - 0 - - 6666.982 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -17100,8 +17100,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 + - 6666.982 - 0 - 0 - 0 @@ -17115,10 +17115,10 @@ entities: - volume: 2500 temperature: 293.15 moles: + - 6666.982 - 0 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -19506,9 +19506,7 @@ entities: - 41608 - 41607 - 41600 - - 41603 - 41604 - - 41605 - 41506 - 41606 - 24748 @@ -19534,9 +19532,7 @@ entities: - type: DeviceList devices: - 41503 - - 41605 - 41604 - - 41603 - 16849 - 23025 - uid: 41619 @@ -20194,6 +20190,11 @@ entities: - type: Transform pos: 12.5,-19.5 parent: 1 + - uid: 32683 + components: + - type: Transform + pos: 8.5,-24.5 + parent: 1 - proto: AirlockAssembly entities: - uid: 4369 @@ -20461,6 +20462,11 @@ entities: - DoorStatus: DoorBolt 17976: - DoorStatus: DoorBolt + - uid: 32684 + components: + - type: Transform + pos: -122.5,-29.5 + parent: 1 - proto: AirlockChiefEngineerLocked entities: - uid: 9755 @@ -20802,6 +20808,10 @@ entities: - DoorStatus: DoorBolt 10673: - DoorStatus: DoorBolt + 10675: + - DoorStatus: DoorBolt + 10674: + - DoorStatus: DoorBolt - uid: 10671 components: - type: Transform @@ -20813,6 +20823,10 @@ entities: - DoorStatus: DoorBolt 10672: - DoorStatus: DoorBolt + 10675: + - DoorStatus: DoorBolt + 10674: + - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - uid: 539 @@ -21087,6 +21101,8 @@ entities: - type: Transform pos: 62.5,-55.5 parent: 1 + - type: DeviceLinkSink + invokeCounter: 2 - type: DeviceLinkSource linkedPorts: 10673: @@ -21098,6 +21114,8 @@ entities: - type: Transform pos: 62.5,-54.5 parent: 1 + - type: DeviceLinkSink + invokeCounter: 2 - type: DeviceLinkSource linkedPorts: 10673: @@ -23398,13 +23416,6 @@ entities: - type: Transform pos: 14.5,-7.5 parent: 1 - - uid: 1576 - components: - - type: MetaData - name: glass airlock to The Hole - - type: Transform - pos: 8.5,-24.5 - parent: 1 - uid: 1577 components: - type: Transform @@ -26495,8 +26506,10 @@ entities: parent: 1 - proto: APCConstructed entities: - - uid: 18602 + - uid: 31263 components: + - type: MetaData + name: particle accelerator APC - type: Transform pos: 58.5,-52.5 parent: 1 @@ -27372,212 +27385,257 @@ entities: - type: Transform pos: 44.5,-6.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 541 components: - type: Transform - pos: -72.5,45.5 + pos: -25.5,-24.5 parent: 1 - uid: 548 components: - type: Transform - pos: -64.5,45.5 + pos: -5.5,-65.5 parent: 1 - uid: 550 components: - type: Transform - pos: -46.5,45.5 + pos: 2.5,-65.5 parent: 1 - - uid: 2036 + - uid: 907 components: - type: Transform - pos: -30.5,42.5 + pos: 16.5,-65.5 parent: 1 - - uid: 2179 + - uid: 908 components: - type: Transform - pos: -74.5,45.5 + pos: 38.5,-65.5 parent: 1 - - uid: 2214 + - uid: 929 components: - type: Transform - pos: -66.5,45.5 + pos: -45.5,-78.5 parent: 1 - - uid: 2464 + - uid: 930 components: - type: Transform - pos: -48.5,45.5 + pos: -3.5,-65.5 parent: 1 - - uid: 5442 + - uid: 1576 components: - type: Transform - pos: -31.5,42.5 + pos: 4.5,-65.5 parent: 1 - - uid: 5579 + - uid: 2036 components: - type: Transform - pos: 3.5,51.5 + pos: 26.5,-65.5 parent: 1 - - uid: 5587 + - uid: 2179 components: - type: Transform - pos: -34.5,42.5 + pos: -41.5,-78.5 parent: 1 - - uid: 5661 + - uid: 2214 components: - type: Transform - pos: -33.5,42.5 + pos: 40.5,-65.5 parent: 1 - - uid: 5991 + - uid: 2464 components: - type: Transform - pos: 28.5,5.5 + pos: 24.5,-65.5 parent: 1 - - uid: 5992 + - uid: 3061 components: - type: Transform - pos: 28.5,9.5 + pos: 48.5,-65.5 parent: 1 - - uid: 9647 + - uid: 3082 + components: + - type: Transform + pos: 46.5,-65.5 + parent: 1 + - uid: 3117 components: - type: Transform + rot: -1.5707963267948966 rad pos: -25.5,10.5 parent: 1 - - uid: 10515 + - uid: 3281 components: - type: Transform + rot: -1.5707963267948966 rad pos: 22.5,-41.5 parent: 1 - - uid: 11108 + - uid: 3410 components: - type: Transform + rot: -1.5707963267948966 rad pos: -26.5,-23.5 parent: 1 - - uid: 12719 + - uid: 4394 components: - type: Transform - pos: -97.5,38.5 + rot: -1.5707963267948966 rad + pos: -137.5,-24.5 parent: 1 - - uid: 12720 + - uid: 5442 components: - type: Transform - pos: -87.5,45.5 + pos: 18.5,-65.5 parent: 1 - - uid: 12721 + - uid: 5579 components: - type: Transform - pos: -87.5,38.5 + pos: -49.5,-78.5 parent: 1 - - uid: 12788 + - uid: 5587 components: - type: Transform - pos: -97.5,45.5 + pos: -93.5,-89.5 parent: 1 - - uid: 16635 + - uid: 5661 components: - type: Transform - pos: -137.5,-24.5 + rot: -1.5707963267948966 rad + pos: -153.5,-33.5 parent: 1 - - uid: 19249 + - uid: 5991 components: - type: Transform - pos: -45.5,-78.5 + rot: 1.5707963267948966 rad + pos: -90.5,-86.5 parent: 1 - - uid: 24591 + - uid: 5992 components: - type: Transform - pos: -5.5,-65.5 + rot: 3.141592653589793 rad + pos: -72.5,45.5 parent: 1 - - uid: 24592 + - uid: 6150 components: - type: Transform - pos: -3.5,-65.5 + rot: 3.141592653589793 rad + pos: -34.5,42.5 parent: 1 - - uid: 24593 + - uid: 6151 components: - type: Transform - pos: 2.5,-65.5 + rot: 3.141592653589793 rad + pos: -64.5,45.5 parent: 1 - - uid: 24594 + - uid: 6152 components: - type: Transform - pos: 4.5,-65.5 + rot: 3.141592653589793 rad + pos: -48.5,45.5 parent: 1 - - uid: 24595 + - uid: 6153 components: - type: Transform - pos: 16.5,-65.5 + rot: 3.141592653589793 rad + pos: -46.5,45.5 parent: 1 - - uid: 24596 + - uid: 6611 components: - type: Transform - pos: 18.5,-65.5 + rot: 3.141592653589793 rad + pos: -33.5,42.5 parent: 1 - - uid: 24597 + - uid: 6615 components: - type: Transform - pos: 24.5,-65.5 + rot: 3.141592653589793 rad + pos: -66.5,45.5 parent: 1 - - uid: 24598 + - uid: 6617 components: - type: Transform - pos: 26.5,-65.5 + rot: 3.141592653589793 rad + pos: -30.5,42.5 parent: 1 - - uid: 24599 + - uid: 6618 components: - type: Transform - pos: 38.5,-65.5 + rot: 3.141592653589793 rad + pos: 3.5,51.5 parent: 1 - - uid: 24600 + - uid: 6619 components: - type: Transform - pos: 40.5,-65.5 + rot: 1.5707963267948966 rad + pos: 28.5,9.5 parent: 1 - - uid: 24601 + - uid: 6620 components: - type: Transform - pos: 46.5,-65.5 + rot: 1.5707963267948966 rad + pos: 28.5,5.5 parent: 1 - - uid: 24602 + - uid: 6629 components: - type: Transform - pos: 48.5,-65.5 + rot: 3.141592653589793 rad + pos: -74.5,45.5 parent: 1 - - uid: 24931 + - uid: 6632 components: - type: Transform - pos: -41.5,-78.5 + rot: -1.5707963267948966 rad + pos: -87.5,45.5 parent: 1 - - uid: 24947 + - uid: 6633 components: - type: Transform - pos: -49.5,-78.5 + rot: -1.5707963267948966 rad + pos: -153.5,-32.5 parent: 1 - - uid: 36459 + - uid: 6635 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -87.5,38.5 + parent: 1 + - uid: 6636 components: - type: Transform + rot: 3.141592653589793 rad pos: -124.5,27.5 parent: 1 - - uid: 36464 + - uid: 6639 components: - type: Transform - pos: -153.5,-32.5 + rot: 1.5707963267948966 rad + pos: -97.5,45.5 parent: 1 - - uid: 36465 + - uid: 6643 components: - type: Transform - pos: -153.5,-33.5 + rot: 1.5707963267948966 rad + pos: -97.5,38.5 parent: 1 - - uid: 41739 + - uid: 32687 components: - type: Transform - pos: -93.5,-89.5 + rot: 3.141592653589793 rad + pos: -31.5,42.5 parent: 1 - - uid: 41810 + - uid: 43123 components: - type: Transform - pos: -90.5,-86.5 + pos: -24.5,-24.5 + parent: 1 + - uid: 43124 + components: + - type: Transform + pos: -23.5,-24.5 + parent: 1 + - uid: 43125 + components: + - type: Transform + pos: -22.5,-24.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -29648,6 +29706,13 @@ entities: rot: 3.141592653589793 rad pos: -65.50091,6.665364 parent: 1 +- proto: Biofabricator + entities: + - uid: 4780 + components: + - type: Transform + pos: -34.5,-11.5 + parent: 1 - proto: BiomassReclaimer entities: - uid: 1731 @@ -29951,10 +30016,11 @@ entities: parent: 1 - proto: BookAtmosAirAlarms entities: - - uid: 15400 + - uid: 2090 components: - type: Transform - pos: -94.90623,-39.386993 + rot: -1.5707963267948966 rad + pos: -94.47202,-41.99912 parent: 1 - proto: BookBartendersManual entities: @@ -30016,11 +30082,11 @@ entities: parent: 1 - proto: BookLeafLoversSecret entities: - - uid: 904 + - uid: 639 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -34.50293,-11.364823 + rot: -1.5707963267948966 rad + pos: -28.470697,-17.970749 parent: 1 - uid: 11025 components: @@ -30517,6 +30583,18 @@ entities: - type: Transform pos: -7.970074,38.58155 parent: 1 +- proto: BoxEnvelope + entities: + - uid: 32620 + components: + - type: Transform + pos: -49.340946,33.642918 + parent: 1 + - uid: 32622 + components: + - type: Transform + pos: -49.653446,33.663765 + parent: 1 - proto: BoxFlashbang entities: - uid: 12144 @@ -30844,11 +30922,6 @@ entities: - type: Transform pos: -46.74948,-33.33157 parent: 1 - - uid: 28648 - components: - - type: Transform - pos: -1.480845,-20.389856 - parent: 1 - uid: 29448 components: - type: Transform @@ -31135,6 +31208,20 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,-36.5 parent: 1 +- proto: ButtonFrameGrey + entities: + - uid: 2300 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 + - uid: 2301 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 - proto: ButtonFrameJanitor entities: - uid: 42175 @@ -45509,6 +45596,11 @@ entities: - type: Transform pos: -6.5,17.5 parent: 1 + - uid: 28648 + components: + - type: Transform + pos: 60.5,-55.5 + parent: 1 - uid: 28649 components: - type: Transform @@ -54895,6 +54987,31 @@ entities: - type: Transform pos: -62.5,-40.5 parent: 1 + - uid: 10648 + components: + - type: Transform + pos: 61.5,-56.5 + parent: 1 + - uid: 10657 + components: + - type: Transform + pos: 59.5,-50.5 + parent: 1 + - uid: 10662 + components: + - type: Transform + pos: 58.5,-50.5 + parent: 1 + - uid: 10877 + components: + - type: Transform + pos: 59.5,-47.5 + parent: 1 + - uid: 10887 + components: + - type: Transform + pos: 60.5,-48.5 + parent: 1 - uid: 10921 components: - type: Transform @@ -55390,16 +55507,6 @@ entities: - type: Transform pos: 61.5,-55.5 parent: 1 - - uid: 14247 - components: - - type: Transform - pos: 61.5,-56.5 - parent: 1 - - uid: 14248 - components: - - type: Transform - pos: 60.5,-56.5 - parent: 1 - uid: 14249 components: - type: Transform @@ -55470,16 +55577,6 @@ entities: - type: Transform pos: 57.5,-49.5 parent: 1 - - uid: 14966 - components: - - type: Transform - pos: 58.5,-49.5 - parent: 1 - - uid: 14971 - components: - - type: Transform - pos: 59.5,-49.5 - parent: 1 - uid: 14973 components: - type: Transform @@ -55565,6 +55662,11 @@ entities: - type: Transform pos: 56.5,-42.5 parent: 1 + - uid: 15203 + components: + - type: Transform + pos: 57.5,-47.5 + parent: 1 - uid: 15206 components: - type: Transform @@ -55578,28 +55680,13 @@ entities: - uid: 15225 components: - type: Transform - pos: 57.5,-46.5 - parent: 1 - - uid: 15247 - components: - - type: Transform - pos: 58.5,-46.5 - parent: 1 - - uid: 15249 - components: - - type: Transform - pos: 59.5,-46.5 + pos: 58.5,-47.5 parent: 1 - uid: 15256 components: - type: Transform pos: 60.5,-46.5 parent: 1 - - uid: 15259 - components: - - type: Transform - pos: 60.5,-45.5 - parent: 1 - uid: 15265 components: - type: Transform @@ -58579,6 +58666,11 @@ entities: - type: Transform pos: 23.5,5.5 parent: 1 + - uid: 29517 + components: + - type: Transform + pos: 59.5,-57.5 + parent: 1 - uid: 29544 components: - type: Transform @@ -58589,11 +58681,21 @@ entities: - type: Transform pos: -79.5,-39.5 parent: 1 + - uid: 30380 + components: + - type: Transform + pos: 60.5,-57.5 + parent: 1 - uid: 30387 components: - type: Transform pos: 9.5,-38.5 parent: 1 + - uid: 30774 + components: + - type: Transform + pos: 61.5,-57.5 + parent: 1 - uid: 32309 components: - type: Transform @@ -63542,6 +63644,11 @@ entities: - type: Transform pos: -70.5,-7.5 parent: 1 + - uid: 10649 + components: + - type: Transform + pos: 59.5,-57.5 + parent: 1 - uid: 10957 components: - type: Transform @@ -71992,11 +72099,6 @@ entities: - type: Transform pos: -40.5,-75.5 parent: 1 - - uid: 39650 - components: - - type: Transform - pos: 58.5,-52.5 - parent: 1 - uid: 39651 components: - type: Transform @@ -73202,6 +73304,11 @@ entities: - type: Transform pos: -27.5,5.5 parent: 1 + - uid: 43155 + components: + - type: Transform + pos: 58.5,-52.5 + parent: 1 - proto: CableMVStack entities: - uid: 3219 @@ -73255,10 +73362,10 @@ entities: rot: 3.141592653589793 rad pos: -112.5,-22.5 parent: 1 - - uid: 10919 + - uid: 10890 components: - type: Transform - pos: 61.5,-55.5 + pos: 61.5,-56.5 parent: 1 - uid: 13298 components: @@ -76273,6 +76380,11 @@ entities: - type: Transform pos: -96.5,-28.5 parent: 1 + - uid: 19293 + components: + - type: Transform + pos: 59.5,-56.5 + parent: 1 - uid: 19927 components: - type: Transform @@ -83535,12 +83647,6 @@ entities: rot: 1.5707963267948966 rad pos: 60.690517,-43.173733 parent: 1 - - uid: 10896 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 60.45093,-49.412567 - parent: 1 - uid: 11034 components: - type: Transform @@ -83581,6 +83687,12 @@ entities: rot: 1.5707963267948966 rad pos: -95.2549,-40.368137 parent: 1 + - uid: 28739 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.387344,-50.33426 + parent: 1 - uid: 28742 components: - type: Transform @@ -84517,17 +84629,6 @@ entities: parent: 1 - proto: Cigarette entities: - - uid: 17689 - components: - - type: Transform - pos: -87.698425,-17.302172 - parent: 1 - - uid: 19293 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -88.51011,-46.27136 - parent: 1 - uid: 28706 components: - type: Transform @@ -84560,17 +84661,6 @@ entities: - type: Transform pos: -6.248913,11.525083 parent: 1 - - uid: 28739 - components: - - type: Transform - pos: 6.7320995,-15.165098 - parent: 1 - - uid: 29442 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.212751,-49.56133 - parent: 1 - proto: CigaretteBanana entities: - uid: 36443 @@ -84797,26 +84887,6 @@ entities: rot: 3.141592653589793 rad pos: -35.667667,-67.367386 parent: 1 - - uid: 31263 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.385698,17.652447 - parent: 1 -- proto: CigPackBlue - entities: - - uid: 15092 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -92.257256,25.130632 - parent: 1 - - uid: 30380 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.647594,-73.685814 - parent: 1 - proto: CigPackGreen entities: - uid: 14743 @@ -84832,12 +84902,6 @@ entities: rot: -1.5707963267948966 rad pos: 70.85632,1.4241102 parent: 1 - - uid: 30774 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -75.63711,-38.75398 - parent: 1 - proto: CigPackMixed entities: - uid: 2056 @@ -85997,6 +86061,26 @@ entities: - type: Transform pos: -0.54146147,-37.24413 parent: 1 +- proto: ClothingBackpackElectropack + entities: + - uid: 2695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.3645833,-23.317299 + parent: 1 + - uid: 2698 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.646861,-21.428116 + parent: 1 + - uid: 2701 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -47.292618,-33.169548 + parent: 1 - proto: ClothingBeltSecurityFilled entities: - uid: 9509 @@ -86053,6 +86137,11 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage + - uid: 41603 + components: + - type: Transform + pos: 61.52096,-53.54917 + parent: 1 - proto: ClothingEyesHudSecurity entities: - uid: 9511 @@ -87307,6 +87396,11 @@ entities: - type: Transform pos: -103.5,11.5 parent: 1 + - uid: 7584 + components: + - type: Transform + pos: -95.5,-39.5 + parent: 1 - uid: 8223 components: - type: Transform @@ -87625,12 +87719,6 @@ entities: rot: -1.5707963267948966 rad pos: -104.5,-33.5 parent: 1 - - uid: 10890 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,-49.5 - parent: 1 - uid: 16180 components: - type: Transform @@ -87641,6 +87729,12 @@ entities: - type: Transform pos: -106.5,12.5 parent: 1 + - uid: 29442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-50.5 + parent: 1 - uid: 34245 components: - type: Transform @@ -87693,13 +87787,6 @@ entities: - type: Transform pos: -28.5,41.5 parent: 1 -- proto: ComputerShuttleSalvage - entities: - - uid: 13170 - components: - - type: Transform - pos: -3.5,51.5 - parent: 1 - proto: ComputerSolarControl entities: - uid: 16186 @@ -88854,58 +88941,65 @@ entities: rot: 3.141592653589793 rad pos: 3.5,31.5 parent: 1 - - uid: 6611 + - uid: 7123 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad pos: -5.5,23.5 parent: 1 - - uid: 6617 + - uid: 7157 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,23.5 + pos: -4.5,26.5 parent: 1 - - uid: 6618 + - uid: 7158 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,23.5 + pos: -4.5,25.5 parent: 1 - - uid: 6619 + - uid: 8505 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,23.5 + pos: 42.5,11.5 parent: 1 - - uid: 6620 + - uid: 8781 components: - type: Transform - rot: 1.5707963267948966 rad + pos: -4.5,24.5 + parent: 1 + - uid: 8967 + components: + - type: Transform + pos: -4.5,28.5 + parent: 1 + - uid: 9639 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: -6.5,23.5 parent: 1 - - uid: 6633 + - uid: 9640 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,23.5 + pos: -4.5,27.5 parent: 1 - - uid: 6635 + - uid: 9642 components: - type: Transform rot: 3.141592653589793 rad - pos: -4.5,23.5 + pos: -6.5,48.5 parent: 1 - - uid: 6639 + - uid: 9647 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,23.5 + rot: 3.141592653589793 rad + pos: -6.5,49.5 parent: 1 - - uid: 8505 + - uid: 9848 components: - type: Transform - pos: 42.5,11.5 + rot: 3.141592653589793 rad + pos: -6.5,50.5 parent: 1 - uid: 10042 components: @@ -89034,19 +89128,35 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,-3.5 parent: 1 + - uid: 10515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,23.5 + parent: 1 - uid: 10656 components: - type: Transform pos: 42.5,7.5 parent: 1 + - uid: 11108 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,23.5 + parent: 1 + - uid: 11289 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,23.5 + parent: 1 - uid: 11292 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,23.5 + rot: -1.5707963267948966 rad + pos: -11.5,23.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - uid: 11313 components: - type: Transform @@ -89198,20 +89308,8 @@ entities: - uid: 12021 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-16.5 - parent: 1 - - uid: 12022 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-16.5 - parent: 1 - - uid: 12023 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-16.5 + rot: -1.5707963267948966 rad + pos: -12.5,23.5 parent: 1 - uid: 13108 components: @@ -89237,41 +89335,10 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,27.5 parent: 1 - - uid: 15165 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,24.5 - parent: 1 - - uid: 15166 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,25.5 - parent: 1 - - uid: 15167 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,26.5 - parent: 1 - - uid: 15168 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,27.5 - parent: 1 - - uid: 15169 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,28.5 - parent: 1 - uid: 15170 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,29.5 + pos: -4.5,23.5 parent: 1 - uid: 17138 components: @@ -89328,6 +89395,29 @@ entities: - type: Transform pos: 42.5,1.5 parent: 1 + - uid: 32629 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-16.5 + parent: 1 + - uid: 36830 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-16.5 + parent: 1 + - uid: 41217 + components: + - type: Transform + pos: -4.5,29.5 + parent: 1 + - uid: 42850 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-16.5 + parent: 1 - proto: CrateArtifactContainer entities: - uid: 6801 @@ -89521,6 +89611,24 @@ entities: - type: Transform pos: 59.5,-45.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: CrateEngineeringSingularityCollector entities: - uid: 15890 @@ -90052,6 +90160,13 @@ entities: - 0 - 0 - 0 +- proto: CrateMaterialGlass + entities: + - uid: 43129 + components: + - type: Transform + pos: 52.5,-49.5 + parent: 1 - proto: CrateMedical entities: - uid: 9063 @@ -91789,24 +91904,6 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,-30.5 parent: 1 - - uid: 6150 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,-14.5 - parent: 1 - - uid: 6151 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,-11.5 - parent: 1 - - uid: 6153 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,-11.5 - parent: 1 - uid: 8312 components: - type: Transform @@ -91847,6 +91944,24 @@ entities: rot: 1.5707963267948966 rad pos: -82.5,-35.5 parent: 1 + - uid: 12563 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,-57.5 + parent: 1 + - uid: 12720 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -28.5,-19.5 + parent: 1 + - uid: 12721 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-16.5 + parent: 1 - uid: 13927 components: - type: Transform @@ -92307,6 +92422,12 @@ entities: rot: -1.5707963267948966 rad pos: -43.5,-25.5 parent: 1 + - uid: 16635 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-13.5 + parent: 1 - uid: 16647 components: - type: Transform @@ -92342,6 +92463,35 @@ entities: - type: Transform pos: -42.5,42.5 parent: 1 + - uid: 19249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-12.5 + parent: 1 + - uid: 24591 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -58.5,-68.5 + parent: 1 + - uid: 24592 + components: + - type: Transform + pos: -13.5,-9.5 + parent: 1 + - uid: 24597 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,-68.5 + parent: 1 + - uid: 24598 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,-66.5 + parent: 1 - uid: 28671 components: - type: Transform @@ -92618,6 +92768,12 @@ entities: rot: 1.5707963267948966 rad pos: -40.5,21.5 parent: 1 + - uid: 30185 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -46.5,-49.5 + parent: 1 - uid: 32468 components: - type: Transform @@ -92660,35 +92816,41 @@ entities: rot: -1.5707963267948966 rad pos: -58.5,-71.5 parent: 1 - - uid: 32544 + - uid: 32542 components: - type: Transform rot: 1.5707963267948966 rad - pos: -58.5,-66.5 + pos: -48.5,-57.5 parent: 1 - - uid: 32545 + - uid: 32543 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-16.5 + parent: 1 + - uid: 32544 components: - type: Transform rot: -1.5707963267948966 rad - pos: -48.5,-66.5 + pos: -22.5,-19.5 parent: 1 - - uid: 32562 + - uid: 32545 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -48.5,-58.5 + rot: -1.5707963267948966 rad + pos: -48.5,-66.5 parent: 1 - - uid: 32563 + - uid: 32546 components: - type: Transform rot: -1.5707963267948966 rad - pos: -44.5,-58.5 + pos: -28.5,-21.5 parent: 1 - - uid: 32575 + - uid: 32547 components: - type: Transform rot: 1.5707963267948966 rad - pos: -44.5,-49.5 + pos: -38.5,-21.5 parent: 1 - uid: 32576 components: @@ -92735,88 +92897,61 @@ entities: - uid: 32607 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -38.5,-22.5 - parent: 1 - - uid: 32608 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -27.5,-22.5 + rot: 3.141592653589793 rad + pos: -23.5,-9.5 parent: 1 - - uid: 32609 + - uid: 32615 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -27.5,-20.5 + pos: -21.5,8.5 parent: 1 - - uid: 32610 + - uid: 32618 components: - type: Transform rot: -1.5707963267948966 rad - pos: -22.5,-20.5 - parent: 1 - - uid: 32611 - components: - - type: Transform - pos: -22.5,-15.5 - parent: 1 - - uid: 32612 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,-15.5 + pos: -21.5,0.5 parent: 1 - - uid: 32613 + - uid: 32619 components: - type: Transform - pos: -23.5,-14.5 + rot: 1.5707963267948966 rad + pos: -23.5,0.5 parent: 1 - - uid: 32645 + - uid: 32640 components: - type: Transform rot: 1.5707963267948966 rad - pos: -24.5,-3.5 + pos: -25.5,18.5 parent: 1 - - uid: 32646 + - uid: 32641 components: - type: Transform rot: -1.5707963267948966 rad - pos: -23.5,-3.5 - parent: 1 - - uid: 32658 - components: - - type: Transform - pos: -23.5,8.5 + pos: -19.5,18.5 parent: 1 - - uid: 32659 + - uid: 32644 components: - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,8.5 + rot: -1.5707963267948966 rad + pos: -29.5,5.5 parent: 1 - - uid: 32660 + - uid: 32646 components: - type: Transform rot: 1.5707963267948966 rad - pos: -25.5,17.5 + pos: -29.5,7.5 parent: 1 - - uid: 32678 + - uid: 32650 components: - type: Transform rot: -1.5707963267948966 rad - pos: -14.5,17.5 - parent: 1 - - uid: 32679 - components: - - type: Transform - pos: -14.5,22.5 + pos: -27.5,7.5 parent: 1 - - uid: 32690 + - uid: 32659 components: - type: Transform rot: 3.141592653589793 rad - pos: -19.5,22.5 + pos: -25.5,8.5 parent: 1 - uid: 32691 components: @@ -93416,11 +93551,23 @@ entities: - type: Transform pos: -27.5,10.5 parent: 1 - - uid: 42849 + - uid: 42852 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,-10.5 + parent: 1 + - uid: 42853 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-11.5 + parent: 1 + - uid: 42861 components: - type: Transform rot: -1.5707963267948966 rad - pos: -27.5,5.5 + pos: -25.5,-10.5 parent: 1 - uid: 42862 components: @@ -93480,6 +93627,56 @@ entities: - type: Transform pos: 13.5,-12.5 parent: 1 + - uid: 43068 + components: + - type: Transform + pos: -25.5,-0.5 + parent: 1 + - uid: 43069 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-0.5 + parent: 1 + - uid: 43070 + components: + - type: Transform + pos: -26.5,3.5 + parent: 1 + - uid: 43071 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,3.5 + parent: 1 + - uid: 43072 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -27.5,5.5 + parent: 1 + - uid: 43077 + components: + - type: Transform + pos: -24.5,5.5 + parent: 1 + - uid: 43078 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,1.5 + parent: 1 + - uid: 43079 + components: + - type: Transform + pos: -20.5,1.5 + parent: 1 + - uid: 43080 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-11.5 + parent: 1 - proto: DisposalJunction entities: - uid: 2416 @@ -94128,12 +94325,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-34.5 parent: 1 - - uid: 6152 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,-12.5 - parent: 1 - uid: 8309 components: - type: Transform @@ -94168,11 +94359,65 @@ entities: rot: 1.5707963267948966 rad pos: -81.5,-35.5 parent: 1 + - uid: 12025 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-12.5 + parent: 1 + - uid: 12027 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -53.5,-68.5 + parent: 1 - uid: 12152 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -44.5,-49.5 + parent: 1 + - uid: 12562 components: - type: Transform rot: 3.141592653589793 rad - pos: -25.5,-13.5 + pos: -46.5,-52.5 + parent: 1 + - uid: 12564 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-19.5 + parent: 1 + - uid: 12565 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-21.5 + parent: 1 + - uid: 12719 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.5,-21.5 + parent: 1 + - uid: 12788 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-16.5 + parent: 1 + - uid: 13170 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-16.5 + parent: 1 + - uid: 13222 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-5.5 parent: 1 - uid: 13564 components: @@ -97541,12 +97786,35 @@ entities: rot: 3.141592653589793 rad pos: -33.5,-13.5 parent: 1 + - uid: 15165 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-3.5 + parent: 1 + - uid: 15166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,4.5 + parent: 1 + - uid: 15169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,18.5 + parent: 1 - uid: 16110 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,36.5 parent: 1 + - uid: 16196 + components: + - type: Transform + pos: -29.5,6.5 + parent: 1 - uid: 16305 components: - type: Transform @@ -97689,6 +97957,54 @@ entities: rot: -1.5707963267948966 rad pos: -70.5,-24.5 parent: 1 + - uid: 24593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,-68.5 + parent: 1 + - uid: 24594 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -55.5,-68.5 + parent: 1 + - uid: 24595 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -56.5,-68.5 + parent: 1 + - uid: 24596 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -57.5,-68.5 + parent: 1 + - uid: 24599 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -45.5,-49.5 + parent: 1 + - uid: 24600 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-50.5 + parent: 1 + - uid: 24601 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-51.5 + parent: 1 + - uid: 24602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-53.5 + parent: 1 - uid: 24740 components: - type: Transform @@ -97700,6 +98016,18 @@ entities: - type: Transform pos: -74.5,-28.5 parent: 1 + - uid: 24931 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-54.5 + parent: 1 + - uid: 24947 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-55.5 + parent: 1 - uid: 25027 components: - type: Transform @@ -97715,6 +98043,12 @@ entities: - type: Transform pos: -56.5,31.5 parent: 1 + - uid: 28279 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-56.5 + parent: 1 - uid: 28655 components: - type: Transform @@ -97751,6 +98085,12 @@ entities: - type: Transform pos: -42.5,33.5 parent: 1 + - uid: 28841 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,-57.5 + parent: 1 - uid: 28844 components: - type: Transform @@ -99597,6 +99937,11 @@ entities: rot: 3.141592653589793 rad pos: -39.5,36.5 parent: 1 + - uid: 29514 + components: + - type: Transform + pos: -48.5,-58.5 + parent: 1 - uid: 29647 components: - type: Transform @@ -99773,53 +100118,28 @@ entities: rot: 3.141592653589793 rad pos: -58.5,-69.5 parent: 1 - - uid: 32542 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -58.5,-68.5 - parent: 1 - - uid: 32543 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -58.5,-67.5 - parent: 1 - - uid: 32546 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -57.5,-66.5 - parent: 1 - - uid: 32547 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,-66.5 - parent: 1 - uid: 32548 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -55.5,-66.5 + pos: -38.5,-22.5 parent: 1 - uid: 32549 components: - type: Transform rot: -1.5707963267948966 rad - pos: -54.5,-66.5 + pos: -37.5,-21.5 parent: 1 - uid: 32550 components: - type: Transform rot: -1.5707963267948966 rad - pos: -53.5,-66.5 + pos: -35.5,-21.5 parent: 1 - uid: 32551 components: - type: Transform rot: -1.5707963267948966 rad - pos: -52.5,-66.5 + pos: -33.5,-21.5 parent: 1 - uid: 32552 components: @@ -99881,63 +100201,89 @@ entities: rot: 3.141592653589793 rad pos: -48.5,-59.5 parent: 1 + - uid: 32562 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,-21.5 + parent: 1 + - uid: 32563 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,-21.5 + parent: 1 - uid: 32564 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -47.5,-58.5 + rot: -1.5707963267948966 rad + pos: -30.5,-21.5 parent: 1 - uid: 32565 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -46.5,-58.5 + rot: -1.5707963267948966 rad + pos: -29.5,-21.5 parent: 1 - uid: 32566 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -45.5,-58.5 + rot: 3.141592653589793 rad + pos: -28.5,-20.5 parent: 1 - uid: 32567 components: - type: Transform - pos: -44.5,-57.5 + rot: 1.5707963267948966 rad + pos: -27.5,-19.5 parent: 1 - uid: 32568 components: - type: Transform - pos: -44.5,-56.5 + rot: 1.5707963267948966 rad + pos: -26.5,-19.5 parent: 1 - uid: 32569 components: - type: Transform - pos: -44.5,-55.5 + rot: 1.5707963267948966 rad + pos: -25.5,-19.5 parent: 1 - uid: 32570 components: - type: Transform - pos: -44.5,-54.5 + rot: 1.5707963267948966 rad + pos: -24.5,-19.5 parent: 1 - uid: 32571 components: - type: Transform - pos: -44.5,-53.5 + rot: -1.5707963267948966 rad + pos: -17.5,-16.5 parent: 1 - uid: 32572 components: - type: Transform - pos: -44.5,-52.5 + rot: -1.5707963267948966 rad + pos: -18.5,-16.5 parent: 1 - uid: 32573 components: - type: Transform - pos: -44.5,-51.5 + rot: -1.5707963267948966 rad + pos: -19.5,-16.5 parent: 1 - uid: 32574 components: - type: Transform - pos: -44.5,-50.5 + rot: -1.5707963267948966 rad + pos: -20.5,-16.5 + parent: 1 + - uid: 32575 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-16.5 parent: 1 - uid: 32579 components: @@ -100074,118 +100420,101 @@ entities: - type: Transform pos: -38.5,-24.5 parent: 1 - - uid: 32615 + - uid: 32608 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-16.5 + pos: -23.5,-4.5 parent: 1 - - uid: 32616 + - uid: 32609 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-17.5 + pos: -21.5,5.5 parent: 1 - - uid: 32617 + - uid: 32610 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-18.5 + pos: -21.5,6.5 parent: 1 - - uid: 32618 + - uid: 32611 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-19.5 + pos: -21.5,7.5 parent: 1 - - uid: 32619 + - uid: 32612 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,-20.5 + rot: -1.5707963267948966 rad + pos: -22.5,8.5 parent: 1 - - uid: 32620 + - uid: 32613 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,-20.5 + rot: -1.5707963267948966 rad + pos: -23.5,8.5 parent: 1 - - uid: 32621 + - uid: 32616 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,-20.5 + rot: 3.141592653589793 rad + pos: -22.5,-17.5 parent: 1 - - uid: 32622 + - uid: 32617 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,-20.5 + rot: 3.141592653589793 rad + pos: -22.5,-18.5 parent: 1 - uid: 32623 components: - type: Transform - pos: -27.5,-21.5 + rot: 3.141592653589793 rad + pos: -19.5,22.5 parent: 1 - uid: 32624 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,-22.5 + rot: 3.141592653589793 rad + pos: -19.5,21.5 parent: 1 - uid: 32625 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,-22.5 + rot: 3.141592653589793 rad + pos: -19.5,20.5 parent: 1 - uid: 32626 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-22.5 + rot: 3.141592653589793 rad + pos: -19.5,19.5 parent: 1 - uid: 32627 components: - type: Transform rot: -1.5707963267948966 rad - pos: -31.5,-22.5 - parent: 1 - - uid: 32628 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-22.5 - parent: 1 - - uid: 32629 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,-22.5 + pos: -20.5,18.5 parent: 1 - uid: 32630 components: - type: Transform rot: -1.5707963267948966 rad - pos: -34.5,-22.5 + pos: -21.5,18.5 parent: 1 - uid: 32631 components: - type: Transform rot: -1.5707963267948966 rad - pos: -35.5,-22.5 + pos: -22.5,18.5 parent: 1 - uid: 32632 components: - type: Transform rot: -1.5707963267948966 rad - pos: -36.5,-22.5 - parent: 1 - - uid: 32633 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,-22.5 + pos: -23.5,18.5 parent: 1 - uid: 32634 components: @@ -100193,47 +100522,28 @@ entities: rot: 3.141592653589793 rad pos: -38.5,-23.5 parent: 1 - - uid: 32638 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-10.5 - parent: 1 - uid: 32639 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-9.5 - parent: 1 - - uid: 32640 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-8.5 - parent: 1 - - uid: 32641 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-7.5 + pos: -25.5,17.5 parent: 1 - uid: 32642 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-6.5 + rot: 1.5707963267948966 rad + pos: -25.5,-2.5 parent: 1 - uid: 32643 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-5.5 + rot: -1.5707963267948966 rad + pos: -16.5,-16.5 parent: 1 - - uid: 32644 + - uid: 32645 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-4.5 + rot: -1.5707963267948966 rad + pos: -28.5,7.5 parent: 1 - uid: 32647 components: @@ -100253,53 +100563,17 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-0.5 parent: 1 - - uid: 32650 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,0.5 - parent: 1 - uid: 32651 components: - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,1.5 - parent: 1 - - uid: 32652 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,2.5 - parent: 1 - - uid: 32653 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,3.5 - parent: 1 - - uid: 32654 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,4.5 - parent: 1 - - uid: 32655 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,5.5 - parent: 1 - - uid: 32656 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,6.5 + rot: 1.5707963267948966 rad + pos: -26.5,-2.5 parent: 1 - - uid: 32657 + - uid: 32660 components: - type: Transform rot: 3.141592653589793 rad - pos: -23.5,7.5 + pos: -25.5,-8.5 parent: 1 - uid: 32661 components: @@ -100347,113 +100621,65 @@ entities: - type: Transform pos: -25.5,16.5 parent: 1 - - uid: 32670 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,17.5 - parent: 1 - - uid: 32671 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,17.5 - parent: 1 - uid: 32672 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,17.5 - parent: 1 - - uid: 32673 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,17.5 - parent: 1 - - uid: 32674 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,17.5 + rot: 3.141592653589793 rad + pos: -23.5,-8.5 parent: 1 - uid: 32675 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,17.5 + rot: 1.5707963267948966 rad + pos: -24.5,-11.5 parent: 1 - uid: 32676 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,17.5 - parent: 1 - - uid: 32677 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,17.5 - parent: 1 - - uid: 32680 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,17.5 - parent: 1 - - uid: 32681 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,17.5 - parent: 1 - - uid: 32682 components: - type: Transform rot: 3.141592653589793 rad - pos: -14.5,18.5 + pos: -23.5,-6.5 parent: 1 - - uid: 32683 + - uid: 32677 components: - type: Transform rot: 3.141592653589793 rad - pos: -14.5,19.5 + pos: -23.5,-7.5 parent: 1 - - uid: 32684 + - uid: 32678 components: - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,20.5 + rot: 1.5707963267948966 rad + pos: -21.5,-9.5 parent: 1 - - uid: 32685 + - uid: 32679 components: - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,21.5 + rot: 1.5707963267948966 rad + pos: -19.5,-9.5 parent: 1 - - uid: 32686 + - uid: 32680 components: - type: Transform rot: 1.5707963267948966 rad - pos: -15.5,22.5 + pos: -22.5,-9.5 parent: 1 - - uid: 32687 + - uid: 32681 components: - type: Transform rot: 1.5707963267948966 rad - pos: -16.5,22.5 + pos: -18.5,-9.5 parent: 1 - - uid: 32688 + - uid: 32682 components: - type: Transform rot: 1.5707963267948966 rad - pos: -17.5,22.5 + pos: -20.5,-9.5 parent: 1 - uid: 32689 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,22.5 + rot: 3.141592653589793 rad + pos: -25.5,-9.5 parent: 1 - uid: 32694 components: @@ -102477,12 +102703,6 @@ entities: rot: 3.141592653589793 rad pos: -39.5,21.5 parent: 1 - - uid: 38461 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -26.5,-2.5 - parent: 1 - uid: 38462 components: - type: Transform @@ -102911,12 +103131,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,21.5 parent: 1 - - uid: 41407 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,-14.5 - parent: 1 - uid: 41408 components: - type: Transform @@ -104970,30 +105184,6 @@ entities: - type: Transform pos: -32.5,4.5 parent: 1 - - uid: 42850 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,5.5 - parent: 1 - - uid: 42851 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,5.5 - parent: 1 - - uid: 42852 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,6.5 - parent: 1 - - uid: 42853 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,7.5 - parent: 1 - uid: 42854 components: - type: Transform @@ -105022,11 +105212,29 @@ entities: - type: Transform pos: -29.5,12.5 parent: 1 + - uid: 42864 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-7.5 + parent: 1 + - uid: 42865 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-6.5 + parent: 1 - uid: 42866 components: - type: Transform pos: 10.5,-24.5 parent: 1 + - uid: 42867 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-5.5 + parent: 1 - uid: 42868 components: - type: Transform @@ -105333,6 +105541,283 @@ entities: rot: 3.141592653589793 rad pos: 9.5,7.5 parent: 1 + - uid: 43064 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-4.5 + parent: 1 + - uid: 43065 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-2.5 + parent: 1 + - uid: 43066 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-1.5 + parent: 1 + - uid: 43067 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-3.5 + parent: 1 + - uid: 43073 + components: + - type: Transform + pos: -27.5,4.5 + parent: 1 + - uid: 43074 + components: + - type: Transform + pos: -26.5,2.5 + parent: 1 + - uid: 43075 + components: + - type: Transform + pos: -26.5,1.5 + parent: 1 + - uid: 43076 + components: + - type: Transform + pos: -26.5,0.5 + parent: 1 + - uid: 43081 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-11.5 + parent: 1 + - uid: 43082 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-11.5 + parent: 1 + - uid: 43083 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-10.5 + parent: 1 + - uid: 43084 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-9.5 + parent: 1 + - uid: 43085 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-8.5 + parent: 1 + - uid: 43086 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-7.5 + parent: 1 + - uid: 43087 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-6.5 + parent: 1 + - uid: 43088 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-5.5 + parent: 1 + - uid: 43089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-4.5 + parent: 1 + - uid: 43090 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-3.5 + parent: 1 + - uid: 43091 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-2.5 + parent: 1 + - uid: 43092 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-1.5 + parent: 1 + - uid: 43093 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-0.5 + parent: 1 + - uid: 43094 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,0.5 + parent: 1 + - uid: 43095 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,1.5 + parent: 1 + - uid: 43096 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,1.5 + parent: 1 + - uid: 43097 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,1.5 + parent: 1 + - uid: 43098 + components: + - type: Transform + pos: -24.5,2.5 + parent: 1 + - uid: 43099 + components: + - type: Transform + pos: -24.5,3.5 + parent: 1 + - uid: 43100 + components: + - type: Transform + pos: -24.5,4.5 + parent: 1 + - uid: 43101 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-9.5 + parent: 1 + - uid: 43102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-9.5 + parent: 1 + - uid: 43103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-9.5 + parent: 1 + - uid: 43104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-9.5 + parent: 1 + - uid: 43105 + components: + - type: Transform + pos: -13.5,-10.5 + parent: 1 + - uid: 43106 + components: + - type: Transform + pos: -13.5,-11.5 + parent: 1 + - uid: 43107 + components: + - type: Transform + pos: -13.5,-12.5 + parent: 1 + - uid: 43108 + components: + - type: Transform + pos: -13.5,-13.5 + parent: 1 + - uid: 43109 + components: + - type: Transform + pos: -13.5,-14.5 + parent: 1 + - uid: 43110 + components: + - type: Transform + pos: -13.5,-15.5 + parent: 1 + - uid: 43111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,3.5 + parent: 1 + - uid: 43112 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,2.5 + parent: 1 + - uid: 43113 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,1.5 + parent: 1 + - uid: 43114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,0.5 + parent: 1 +- proto: DisposalRouterFlipped + entities: + - uid: 12023 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,-11.5 + parent: 1 + - type: DisposalRouter + tags: + - Common Hydroponics + - uid: 12024 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-11.5 + parent: 1 + - type: DisposalRouter + tags: + - Prison Hydroponics + - uid: 40966 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,5.5 + parent: 1 + - type: DisposalRouter + tags: + - Common Kitchen + - uid: 42859 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,5.5 + parent: 1 + - type: DisposalRouter + tags: + - Prison Kitchen - proto: DisposalTagger entities: - uid: 4552 @@ -105604,12 +106089,6 @@ entities: - type: Transform pos: -28.5,-11.5 parent: 1 - - uid: 28841 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-2.5 - parent: 1 - uid: 28856 components: - type: Transform @@ -105729,29 +106208,6 @@ entities: parent: 1 - proto: DisposalTrunk entities: - - uid: 3061 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,6.5 - parent: 1 - - uid: 3082 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,6.5 - parent: 1 - - uid: 3117 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-13.5 - parent: 1 - - uid: 3281 - components: - - type: Transform - pos: -24.5,-12.5 - parent: 1 - uid: 6621 components: - type: Transform @@ -106169,6 +106625,28 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-61.5 parent: 1 + - uid: 32652 + components: + - type: Transform + pos: -26.5,6.5 + parent: 1 + - uid: 32653 + components: + - type: Transform + pos: -25.5,6.5 + parent: 1 + - uid: 32654 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-13.5 + parent: 1 + - uid: 32655 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-12.5 + parent: 1 - uid: 32981 components: - type: Transform @@ -107179,6 +107657,18 @@ entities: - type: Transform pos: -87.573425,-17.312595 parent: 1 +- proto: DrinkCreamCartonXL + entities: + - uid: 43126 + components: + - type: Transform + pos: -22.355007,-23.196678 + parent: 1 + - uid: 43127 + components: + - type: Transform + pos: -22.636257,-23.207102 + parent: 1 - proto: DrinkDoctorsDelightGlass entities: - uid: 9692 @@ -107363,13 +107853,6 @@ entities: - type: Transform pos: -101.65036,-1.0470593 parent: 1 -- proto: DrinkMilkCarton - entities: - - uid: 41989 - components: - - type: Transform - pos: -24.361698,9.772873 - parent: 1 - proto: DrinkMugBlack entities: - uid: 30366 @@ -107550,13 +108033,6 @@ entities: - type: Transform pos: -58.353912,-80.77482 parent: 1 -- proto: DrinkOatMilkCarton - entities: - - uid: 9639 - components: - - type: Transform - pos: -24.46927,9.605224 - parent: 1 - proto: DrinkPatronBottleFull entities: - uid: 21261 @@ -107637,6 +108113,11 @@ entities: - type: Transform pos: -6.8075304,-57.165375 parent: 1 + - uid: 43128 + components: + - type: Transform + pos: -22.782091,-23.363462 + parent: 1 - proto: DrinkShinyFlask entities: - uid: 17539 @@ -108994,6 +109475,11 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight + - uid: 32658 + components: + - type: Transform + pos: -127.5,-33.5 + parent: 1 - uid: 33772 components: - type: Transform @@ -109206,11 +109692,6 @@ entities: rot: 3.141592653589793 rad pos: -14.5,-56.5 parent: 1 - - uid: 41196 - components: - - type: Transform - pos: -120.5,-32.5 - parent: 1 - uid: 41197 components: - type: Transform @@ -109328,11 +109809,6 @@ entities: rot: -1.5707963267948966 rad pos: -109.5,-38.5 parent: 1 - - uid: 41217 - components: - - type: Transform - pos: -127.5,-33.5 - parent: 1 - uid: 41218 components: - type: Transform @@ -109395,6 +109871,11 @@ entities: rot: 3.141592653589793 rad pos: -54.5,35.5 parent: 1 + - uid: 41605 + components: + - type: Transform + pos: -120.5,-32.5 + parent: 1 - uid: 42997 components: - type: Transform @@ -112176,9 +112657,7 @@ entities: devices: - 41606 - 41506 - - 41605 - 41604 - - 41603 - 41600 - 41607 - 41608 @@ -112208,9 +112687,7 @@ entities: - type: DeviceList devices: - 41503 - - 41605 - 41604 - - 41603 - uid: 41620 components: - type: Transform @@ -115955,17 +116432,6 @@ entities: - 7586 - 6689 - 29917 - - uid: 41603 - components: - - type: Transform - pos: -122.5,-30.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 41597 - - 41596 - - 41602 - - 41601 - uid: 41604 components: - type: Transform @@ -115977,17 +116443,6 @@ entities: - 41596 - 41602 - 41601 - - uid: 41605 - components: - - type: Transform - pos: -122.5,-28.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 41597 - - 41596 - - 41602 - - 41601 - uid: 41611 components: - type: Transform @@ -118765,23 +119220,6 @@ entities: - type: Transform pos: -24.36231,11.578384 parent: 1 -- proto: FoodCarrot - entities: - - uid: 12563 - components: - - type: Transform - pos: -26.355158,-6.3291545 - parent: 1 - - uid: 12564 - components: - - type: Transform - pos: -26.511408,-6.2978826 - parent: 1 - - uid: 12565 - components: - - type: Transform - pos: -26.563492,-6.2353396 - parent: 1 - proto: FoodCheese entities: - uid: 12453 @@ -118813,6 +119251,12 @@ entities: - type: Transform pos: 19.331057,-35.095882 parent: 1 + - uid: 43135 + components: + - type: Transform + parent: 43134 + - type: Physics + canCollide: False - proto: FoodCondimentBottleKetchup entities: - uid: 16231 @@ -118827,6 +119271,20 @@ entities: - type: Transform pos: -36.542675,-7.269909 parent: 1 +- proto: FoodCondimentPacketFrostoil + entities: + - uid: 43145 + components: + - type: Transform + parent: 43144 + - type: Physics + canCollide: False + - uid: 43146 + components: + - type: Transform + parent: 43144 + - type: Physics + canCollide: False - proto: FoodCondimentPacketHorseradish entities: - uid: 12437 @@ -118852,6 +119310,14 @@ entities: rot: 3.141592653589793 rad pos: 19.826754,-12.501836 parent: 1 +- proto: FoodCondimentPacketPepper + entities: + - uid: 43147 + components: + - type: Transform + parent: 43144 + - type: Physics + canCollide: False - proto: FoodContainerEgg entities: - uid: 1853 @@ -118899,6 +119365,22 @@ entities: rot: 3.141592653589793 rad pos: -69.73008,2.5374973 parent: 1 +- proto: FoodDonkpocketPizza + entities: + - uid: 43137 + components: + - type: Transform + parent: 43134 + - type: Physics + canCollide: False +- proto: FoodDonkpocketTeriyaki + entities: + - uid: 43136 + components: + - type: Transform + parent: 43134 + - type: Physics + canCollide: False - proto: FoodDonutJelly entities: - uid: 2912 @@ -119019,6 +119501,19 @@ entities: - type: Transform pos: -22.999104,-24.087002 parent: 1 +- proto: FoodKebabSkewer + entities: + - uid: 23691 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 68.86674,0.631893 + parent: 1 + - uid: 34157 + components: + - type: Transform + pos: -92.34517,-42.339275 + parent: 1 - proto: FoodLollipop entities: - uid: 4599 @@ -119167,38 +119662,6 @@ entities: - type: Transform pos: -39.45363,-67.880325 parent: 1 -- proto: FoodMeat - entities: - - uid: 9640 - components: - - type: Transform - pos: -23.522871,9.588505 - parent: 1 - - uid: 9641 - components: - - type: Transform - pos: -23.522871,9.588505 - parent: 1 - - uid: 9642 - components: - - type: Transform - pos: -23.522871,9.588505 - parent: 1 -- proto: FoodMeatLizardtailKebab - entities: - - uid: 23691 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 68.86674,0.631893 - parent: 1 -- proto: FoodMeatRatdoubleKebab - entities: - - uid: 34157 - components: - - type: Transform - pos: -92.34517,-42.339275 - parent: 1 - proto: FoodMeatSalami entities: - uid: 29515 @@ -119468,31 +119931,6 @@ entities: parent: 1 - proto: FoodPotato entities: - - uid: 907 - components: - - type: Transform - pos: -27.375992,-8.299273 - parent: 1 - - uid: 908 - components: - - type: Transform - pos: -27.365574,-8.45563 - parent: 1 - - uid: 929 - components: - - type: Transform - pos: -27.521824,-8.278425 - parent: 1 - - uid: 930 - components: - - type: Transform - pos: -27.490574,-8.486902 - parent: 1 - - uid: 12562 - components: - - type: Transform - pos: -27.594742,-8.445207 - parent: 1 - uid: 41390 components: - type: Transform @@ -119586,14 +120024,7 @@ entities: - type: Transform pos: -7.4966226,26.602148 parent: 1 -- proto: FoodTacoBeef - entities: - - uid: 36858 - components: - - type: Transform - pos: -108.51099,-15.411085 - parent: 1 -- proto: FoodTacoChickenSupreme +- proto: FoodTacoShell entities: - uid: 3327 components: @@ -119605,6 +120036,11 @@ entities: - type: Transform pos: -113.362076,-54.217827 parent: 1 + - uid: 36858 + components: + - type: Transform + pos: -108.51099,-15.411085 + parent: 1 - proto: FoodTinBeans entities: - uid: 31244 @@ -151449,14 +151885,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#3399FFFF' - - uid: 28279 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-24.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 28281 components: - type: Transform @@ -182081,11 +182509,6 @@ entities: - type: Transform pos: 31.5,-43.5 parent: 1 - - uid: 10657 - components: - - type: Transform - pos: 59.5,-52.5 - parent: 1 - uid: 10658 components: - type: Transform @@ -183546,6 +183969,11 @@ entities: - type: Transform pos: -73.5,-16.5 parent: 1 + - uid: 15092 + components: + - type: Transform + pos: 59.5,-52.5 + parent: 1 - uid: 15100 components: - type: Transform @@ -186396,6 +186824,16 @@ entities: - type: Transform pos: -121.5,-50.5 parent: 1 + - uid: 32670 + components: + - type: Transform + pos: -122.5,-28.5 + parent: 1 + - uid: 32671 + components: + - type: Transform + pos: -122.5,-30.5 + parent: 1 - uid: 32918 components: - type: Transform @@ -189246,6 +189684,11 @@ entities: - type: Transform pos: 43.5,-0.5 parent: 1 + - uid: 41739 + components: + - type: Transform + pos: -122.5,-27.5 + parent: 1 - uid: 41869 components: - type: Transform @@ -190387,11 +190830,6 @@ entities: - type: Transform pos: -49.1553,32.613728 parent: 1 - - uid: 7584 - components: - - type: Transform - pos: -65.61705,23.486242 - parent: 1 - uid: 9044 components: - type: Transform @@ -190407,6 +190845,11 @@ entities: - type: Transform pos: -62.701748,-31.470161 parent: 1 + - uid: 43167 + components: + - type: Transform + pos: -65.534615,23.29667 + parent: 1 - proto: HappyHonk entities: - uid: 28661 @@ -190539,18 +190982,17 @@ entities: rot: 3.141592653589793 rad pos: 7.5583315,-10.995381 parent: 1 - - uid: 34876 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.45170987,-20.482744 - parent: 1 - uid: 34880 components: - type: Transform rot: 1.5707963267948966 rad pos: -49.58078,-41.406494 parent: 1 + - uid: 39650 + components: + - type: Transform + pos: -0.44299912,-20.356264 + parent: 1 - proto: HospitalCurtains entities: - uid: 4885 @@ -190903,11 +191345,6 @@ entities: parent: 1 - proto: InflatableDoor entities: - - uid: 13222 - components: - - type: Transform - pos: -122.5,-29.5 - parent: 1 - uid: 15724 components: - type: Transform @@ -190947,11 +191384,6 @@ entities: parent: 1 - proto: InflatableWall entities: - - uid: 8967 - components: - - type: Transform - pos: -122.5,-30.5 - parent: 1 - uid: 15705 components: - type: Transform @@ -190968,11 +191400,6 @@ entities: - type: Transform pos: -81.5,-70.5 parent: 1 - - uid: 16196 - components: - - type: Transform - pos: -122.5,-28.5 - parent: 1 - uid: 33893 components: - type: Transform @@ -192154,6 +192581,20 @@ entities: - type: Transform pos: -9.708311,-58.46945 parent: 1 +- proto: LockableButtonSecurity + entities: + - uid: 43133 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-11.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 43132: + - Pressed: Toggle + 43131: + - Pressed: Toggle - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 6008 @@ -192201,6 +192642,18 @@ entities: - type: Transform pos: -55.5,-1.5 parent: 1 +- proto: LockerBotanistFilled + entities: + - uid: 38461 + components: + - type: Transform + pos: -27.5,-15.5 + parent: 1 + - uid: 43130 + components: + - type: Transform + pos: -27.5,-14.5 + parent: 1 - proto: LockerBrigmedicFilledHardsuit entities: - uid: 15212 @@ -193203,6 +193656,14 @@ entities: - type: Transform pos: -53.5,-75.5 parent: 1 +- proto: LootSpawnerMaterialsSurplus + entities: + - uid: 43148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,-50.5 + parent: 1 - proto: Machete entities: - uid: 3223 @@ -193314,10 +193775,15 @@ entities: - type: Transform pos: -62.5,-34.5 parent: 1 - - uid: 10898 + - uid: 10876 components: - type: Transform - pos: 60.5,-45.5 + pos: 58.5,-46.5 + parent: 1 + - uid: 10896 + components: + - type: Transform + pos: 60.5,-48.5 parent: 1 - uid: 10899 components: @@ -193329,11 +193795,6 @@ entities: - type: Transform pos: 60.5,-47.5 parent: 1 - - uid: 10901 - components: - - type: Transform - pos: 58.5,-45.5 - parent: 1 - uid: 10903 components: - type: Transform @@ -194155,13 +194616,6 @@ entities: - type: Transform pos: -68.354355,23.527685 parent: 1 -- proto: MaterialReclaimer - entities: - - uid: 6629 - components: - - type: Transform - pos: -11.5,23.5 - parent: 1 - proto: MaterialWoodPlank entities: - uid: 4234 @@ -194353,11 +194807,6 @@ entities: - type: Transform pos: -69.49619,-22.27755 parent: 1 - - uid: 13955 - components: - - type: Transform - pos: -65.6483,23.840654 - parent: 1 - uid: 28517 components: - type: Transform @@ -194368,6 +194817,11 @@ entities: - type: Transform pos: -108.11858,2.6922636 parent: 1 + - uid: 43166 + components: + - type: Transform + pos: -68.58669,23.724052 + parent: 1 - proto: MedkitBruteFilled entities: - uid: 29219 @@ -194674,6 +195128,11 @@ entities: - type: Transform pos: -81.5,-4.5 parent: 1 + - uid: 14971 + components: + - type: Transform + pos: -20.5,34.5 + parent: 1 - uid: 30717 components: - type: Transform @@ -197610,6 +198069,12 @@ entities: - type: Transform pos: -14.826958,23.972439 parent: 1 + - uid: 43139 + components: + - type: Transform + parent: 43138 + - type: Physics + canCollide: False - proto: Multitool entities: - uid: 2894 @@ -203978,18 +204443,19 @@ entities: parent: 1 - proto: ParticleAcceleratorControlBox entities: - - uid: 10876 + - uid: 10663 components: - type: Transform - pos: 58.5,-47.5 + rot: 3.141592653589793 rad + pos: 58.5,-48.5 parent: 1 - proto: ParticleAcceleratorFuelChamberUnfinished entities: - - uid: 10877 + - uid: 15204 components: - type: Transform rot: 1.5707963267948966 rad - pos: 58.5,-46.5 + pos: 58.5,-47.5 parent: 1 - proto: PartRodMetal entities: @@ -204347,6 +204813,12 @@ entities: - type: Transform pos: -17.577652,-17.448551 parent: 1 + - uid: 43140 + components: + - type: Transform + parent: 43138 + - type: Physics + canCollide: False - proto: PhoneInstrument entities: - uid: 31064 @@ -204875,11 +205347,6 @@ entities: - type: Transform pos: 22.5,-3.5 parent: 1 - - uid: 6636 - components: - - type: Transform - pos: -5.5,23.5 - parent: 1 - uid: 9982 components: - type: Transform @@ -204972,6 +205439,12 @@ entities: - type: Transform pos: 3.5,34.5 parent: 1 + - uid: 32621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,23.5 + parent: 1 - proto: PlasticFlapsOpaque entities: - uid: 15284 @@ -205942,11 +206415,6 @@ entities: - type: Transform pos: -108.5,-35.5 parent: 1 - - uid: 15267 - components: - - type: Transform - pos: 60.5,-56.5 - parent: 1 - uid: 15855 components: - type: Transform @@ -205962,6 +206430,11 @@ entities: - type: Transform pos: -110.5,-19.5 parent: 1 + - uid: 43154 + components: + - type: Transform + pos: 60.5,-57.5 + parent: 1 - proto: PortableGeneratorSuperPacman entities: - uid: 8277 @@ -207191,10 +207664,10 @@ entities: parent: 1 - proto: PowerCellRecharger entities: - - uid: 4780 + - uid: 641 components: - type: Transform - pos: -65.5,22.5 + pos: -65.5,23.5 parent: 1 - uid: 5832 components: @@ -207229,12 +207702,6 @@ entities: rot: 1.5707963267948966 rad pos: 61.5,-43.5 parent: 1 - - uid: 10916 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 61.5,-49.5 - parent: 1 - uid: 11298 components: - type: Transform @@ -207325,17 +207792,16 @@ entities: - type: Transform pos: 7.5,-11.5 parent: 1 - - uid: 18852 + - uid: 17689 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -112.5,-40.5 + pos: 61.5,-50.5 parent: 1 - - uid: 20327 + - uid: 18852 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -95.5,-39.5 + rot: -1.5707963267948966 rad + pos: -112.5,-40.5 parent: 1 - uid: 20366 components: @@ -210080,6 +210546,11 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,-2.5 parent: 1 + - uid: 15167 + components: + - type: Transform + pos: -128.5,-33.5 + parent: 1 - uid: 15279 components: - type: Transform @@ -210112,6 +210583,11 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 + - uid: 32690 + components: + - type: Transform + pos: -119.5,-32.5 + parent: 1 - uid: 39809 components: - type: Transform @@ -210148,11 +210624,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,35.5 parent: 1 - - uid: 40966 - components: - - type: Transform - pos: -128.5,-33.5 - parent: 1 - uid: 40970 components: - type: Transform @@ -210177,11 +210648,6 @@ entities: rot: 3.141592653589793 rad pos: -119.5,-43.5 parent: 1 - - uid: 41073 - components: - - type: Transform - pos: -119.5,-32.5 - parent: 1 - proto: PoweredLightColoredBlack entities: - uid: 16388 @@ -210596,15 +211062,15 @@ entities: - type: Transform pos: -111.5,6.5 parent: 1 - - uid: 15203 + - uid: 15259 components: - type: Transform - pos: 1.5,21.5 + pos: -2.5,20.5 parent: 1 - - uid: 15204 + - uid: 15267 components: - type: Transform - pos: -2.5,21.5 + pos: 1.5,20.5 parent: 1 - uid: 15900 components: @@ -211224,12 +211690,6 @@ entities: rot: 3.141592653589793 rad pos: 58.5,-40.5 parent: 1 - - uid: 41017 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 58.5,-54.5 - parent: 1 - uid: 41033 components: - type: Transform @@ -212746,6 +213206,11 @@ entities: - type: Transform pos: -110.5,-28.5 parent: 1 + - uid: 9036 + components: + - type: Transform + pos: 61.5,-53.5 + parent: 1 - uid: 9049 components: - type: Transform @@ -213682,65 +214147,17 @@ entities: - type: Transform pos: -44.5,-3.5 parent: 1 - - uid: 2090 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,-38.5 - parent: 1 - uid: 2101 components: - type: Transform rot: 3.141592653589793 rad pos: -32.5,21.5 parent: 1 - - uid: 2253 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 51.5,-38.5 - parent: 1 - - uid: 2289 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 45.5,-38.5 - parent: 1 - uid: 2290 components: - type: Transform rot: 3.141592653589793 rad - pos: 46.5,-38.5 - parent: 1 - - uid: 2300 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 47.5,-38.5 - parent: 1 - - uid: 2301 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 50.5,-38.5 - parent: 1 - - uid: 2304 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,-38.5 - parent: 1 - - uid: 2321 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 53.5,-38.5 - parent: 1 - - uid: 2325 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,-38.5 + pos: 45.5,-38.5 parent: 1 - uid: 5384 components: @@ -214015,16 +214432,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,21.5 parent: 1 - - uid: 12024 - components: - - type: Transform - pos: 15.5,-15.5 - parent: 1 - - uid: 12025 - components: - - type: Transform - pos: 14.5,-15.5 - parent: 1 - uid: 12330 components: - type: Transform @@ -214444,104 +214851,104 @@ entities: pos: 22.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42326 components: - type: Transform pos: 23.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42327 components: - type: Transform pos: 24.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42328 components: - type: Transform pos: 25.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42329 components: - type: Transform pos: 26.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42330 components: - type: Transform pos: 27.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42331 components: - type: Transform pos: 28.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42332 components: - type: Transform pos: 29.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42333 components: - type: Transform pos: 30.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42334 components: - type: Transform pos: 31.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42335 components: - type: Transform pos: 32.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42336 components: - type: Transform pos: 33.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42337 components: - type: Transform pos: 34.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42338 components: - type: Transform @@ -214549,8 +214956,8 @@ entities: pos: 22.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42339 components: - type: Transform @@ -214558,8 +214965,8 @@ entities: pos: 23.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42340 components: - type: Transform @@ -214567,8 +214974,8 @@ entities: pos: 24.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42341 components: - type: Transform @@ -214576,8 +214983,8 @@ entities: pos: 25.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42342 components: - type: Transform @@ -214585,8 +214992,8 @@ entities: pos: 26.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42343 components: - type: Transform @@ -214594,8 +215001,8 @@ entities: pos: 27.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42344 components: - type: Transform @@ -214603,8 +215010,8 @@ entities: pos: 28.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42345 components: - type: Transform @@ -214612,8 +215019,8 @@ entities: pos: 29.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42346 components: - type: Transform @@ -214621,8 +215028,8 @@ entities: pos: 30.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42347 components: - type: Transform @@ -214630,8 +215037,8 @@ entities: pos: 31.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42348 components: - type: Transform @@ -214639,8 +215046,8 @@ entities: pos: 32.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42349 components: - type: Transform @@ -214648,8 +215055,8 @@ entities: pos: 33.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42350 components: - type: Transform @@ -214657,8 +215064,56 @@ entities: pos: 34.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable + - uid: 43157 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,-38.5 + parent: 1 + - uid: 43159 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-38.5 + parent: 1 + - uid: 43160 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,-38.5 + parent: 1 + - uid: 43161 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,-38.5 + parent: 1 + - uid: 43162 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-38.5 + parent: 1 + - uid: 43163 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-38.5 + parent: 1 + - uid: 43164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,-38.5 + parent: 1 + - uid: 43165 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 46.5,-38.5 + parent: 1 - proto: RailingCorner entities: - uid: 1477 @@ -215548,6 +216003,13 @@ entities: - type: Transform pos: -120.5,-48.5 parent: 1 +- proto: RandomIngredient + entities: + - uid: 32656 + components: + - type: Transform + pos: -24.490547,9.58144 + parent: 1 - proto: RandomInstruments entities: - uid: 8574 @@ -215749,6 +216211,14 @@ entities: - type: Transform pos: 42.5,34.5 parent: 1 +- proto: RandomMeat + entities: + - uid: 32657 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.480131,9.52932 + parent: 1 - proto: RandomPainting entities: - uid: 11681 @@ -216273,6 +216743,16 @@ entities: - type: Transform pos: -26.5,-8.5 parent: 1 + - uid: 32673 + components: + - type: Transform + pos: -27.5,-8.5 + parent: 1 + - uid: 32674 + components: + - type: Transform + pos: -26.5,-6.5 + parent: 1 - uid: 37380 components: - type: Transform @@ -221683,6 +222163,55 @@ entities: - type: Transform pos: 63.5,33.5 parent: 1 +- proto: RandomSmokables + entities: + - uid: 10898 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -87.71364,-17.604465 + parent: 1 + - uid: 10901 + components: + - type: Transform + pos: -88.303764,-46.31555 + parent: 1 + - uid: 10916 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.687157,-15.542501 + parent: 1 + - uid: 10918 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.2677426,-49.5005 + parent: 1 + - uid: 10919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.336027,17.71119 + parent: 1 + - uid: 10920 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -92.30878,25.097778 + parent: 1 + - uid: 14247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.660622,-73.661354 + parent: 1 + - uid: 14248 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -75.732475,-38.726807 + parent: 1 - proto: RandomSnacks entities: - uid: 3683 @@ -222238,17 +222767,23 @@ entities: parent: 1 - proto: Recycler entities: - - uid: 4394 + - uid: 12022 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-16.5 + rot: 3.141592653589793 rad + pos: -6.5,49.5 parent: 1 - - uid: 6643 + - uid: 15168 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,23.5 + rot: -1.5707963267948966 rad + pos: -11.5,23.5 + parent: 1 + - uid: 41407 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-16.5 parent: 1 - proto: ReinforcedGirder entities: @@ -226791,16 +227326,6 @@ entities: - type: Transform pos: 31.5,-43.5 parent: 1 - - uid: 10662 - components: - - type: Transform - pos: 59.5,-52.5 - parent: 1 - - uid: 10663 - components: - - type: Transform - pos: 60.5,-52.5 - parent: 1 - uid: 10664 components: - type: Transform @@ -227786,6 +228311,11 @@ entities: - type: Transform pos: 30.5,-24.5 parent: 1 + - uid: 14966 + components: + - type: Transform + pos: 59.5,-52.5 + parent: 1 - uid: 15074 components: - type: Transform @@ -227806,6 +228336,11 @@ entities: - type: Transform pos: -95.5,26.5 parent: 1 + - uid: 15249 + components: + - type: Transform + pos: 60.5,-52.5 + parent: 1 - uid: 15516 components: - type: Transform @@ -228926,6 +229461,16 @@ entities: - type: Transform pos: -134.5,-4.5 parent: 1 + - uid: 32685 + components: + - type: Transform + pos: -122.5,-27.5 + parent: 1 + - uid: 32686 + components: + - type: Transform + pos: -122.5,-30.5 + parent: 1 - uid: 32886 components: - type: Transform @@ -229971,6 +230516,11 @@ entities: - type: Transform pos: 47.5,-41.5 parent: 1 + - uid: 41073 + components: + - type: Transform + pos: -122.5,-28.5 + parent: 1 - uid: 41558 components: - type: Transform @@ -230455,6 +231005,54 @@ entities: - type: Transform pos: 23.5,-42.5 parent: 1 +- proto: SalvageSpawnerScrapCommon + entities: + - uid: 32628 + components: + - type: Transform + pos: 21.5,-13.5 + parent: 1 + - uid: 43116 + components: + - type: Transform + pos: 19.5,-12.5 + parent: 1 + - uid: 43121 + components: + - type: Transform + pos: 77.5,41.5 + parent: 1 +- proto: SalvageSpawnerScrapCommon75 + entities: + - uid: 43119 + components: + - type: Transform + pos: 77.5,37.5 + parent: 1 +- proto: SalvageSpawnerScrapValuable + entities: + - uid: 43117 + components: + - type: Transform + pos: 74.5,-0.5 + parent: 1 + - uid: 43118 + components: + - type: Transform + pos: 78.5,-11.5 + parent: 1 + - uid: 43122 + components: + - type: Transform + pos: 78.5,40.5 + parent: 1 +- proto: SalvageSpawnerScrapValuable75 + entities: + - uid: 43120 + components: + - type: Transform + pos: 90.5,30.5 + parent: 1 - proto: Saw entities: - uid: 9056 @@ -230873,12 +231471,6 @@ entities: - type: Transform pos: -75.37833,-33.457405 parent: 1 - - uid: 29514 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 51.5903,-50.36724 - parent: 1 - uid: 34554 components: - type: Transform @@ -231267,25 +231859,125 @@ entities: - type: Transform pos: -111.40744,-3.3558848 parent: 1 -- proto: ShockCollar +- proto: ShelfKitchen entities: - - uid: 2695 + - uid: 43144 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.3645833,-23.317299 + rot: -1.5707963267948966 rad + pos: -66.5,16.5 parent: 1 - - uid: 2698 + - type: Storage + storedItems: + 43145: + position: 0,0 + _rotation: South + 43146: + position: 1,0 + _rotation: South + 43147: + position: 2,0 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 43145 + - 43146 + - 43147 +- proto: ShelfMetal + entities: + - uid: 10647 components: - type: Transform - rot: 3.141592653589793 rad - pos: 13.646861,-21.428116 + pos: -41.5,32.5 parent: 1 - - uid: 2701 + - uid: 39881 components: - type: Transform - rot: 3.141592653589793 rad - pos: -47.292618,-33.169548 + pos: -21.5,34.5 + parent: 1 + - type: Storage + storedItems: + 41017: + position: 0,0 + _rotation: East + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 41017 + - uid: 43138 + components: + - type: Transform + pos: -7.5,27.5 + parent: 1 + - type: Storage + storedItems: + 43139: + position: 0,0 + _rotation: South + 43140: + position: 1,0 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 43139 + - 43140 +- proto: ShelfRWood + entities: + - uid: 43134 + components: + - type: Transform + pos: -24.5,34.5 + parent: 1 + - type: Storage + storedItems: + 43135: + position: 0,0 + _rotation: South + 43136: + position: 1,0 + _rotation: South + 43137: + position: 2,0 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 43135 + - 43136 + - 43137 +- proto: ShelfWood + entities: + - uid: 43141 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -50.5,27.5 + parent: 1 + - uid: 43142 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,27.5 + parent: 1 + - uid: 43143 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,27.5 parent: 1 - proto: Shovel entities: @@ -231342,6 +232034,16 @@ entities: - type: Transform pos: -61.5,-69.5 parent: 1 + - uid: 43131 + components: + - type: Transform + pos: 21.5,-11.5 + parent: 1 + - uid: 43132 + components: + - type: Transform + pos: 22.5,-11.5 + parent: 1 - proto: ShuttersNormalOpen entities: - uid: 1051 @@ -231349,6 +232051,31 @@ entities: - type: Transform pos: -12.5,-28.5 parent: 1 + - uid: 2289 + components: + - type: Transform + pos: -63.5,22.5 + parent: 1 + - uid: 2304 + components: + - type: Transform + pos: -63.5,19.5 + parent: 1 + - uid: 2321 + components: + - type: Transform + pos: -63.5,21.5 + parent: 1 + - uid: 2325 + components: + - type: Transform + pos: -63.5,23.5 + parent: 1 + - uid: 3595 + components: + - type: Transform + pos: -63.5,20.5 + parent: 1 - uid: 3604 components: - type: Transform @@ -231564,6 +232291,16 @@ entities: - type: Transform pos: -51.5,-22.5 parent: 1 + - uid: 43156 + components: + - type: Transform + pos: -70.5,21.5 + parent: 1 + - uid: 43158 + components: + - type: Transform + pos: -70.5,22.5 + parent: 1 - proto: ShuttersRadiationOpen entities: - uid: 10902 @@ -231724,6 +232461,36 @@ entities: - Pressed: DoorBolt - proto: SignalButtonDirectional entities: + - uid: 904 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 43158: + - Pressed: Toggle + 43156: + - Pressed: Toggle + - uid: 2253 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 2325: + - Pressed: Toggle + 2289: + - Pressed: Toggle + 2321: + - Pressed: Toggle + 3595: + - Pressed: Toggle + 2304: + - Pressed: Toggle - uid: 5773 components: - type: MetaData @@ -234409,8 +235176,6 @@ entities: - type: Transform pos: -98.5,-31.5 parent: 1 -- proto: SignAtmosMinsky - entities: - uid: 36728 components: - type: Transform @@ -234492,15 +235257,11 @@ entities: - type: Transform pos: 5.5,-36.5 parent: 1 -- proto: SignChemistry1 - entities: - uid: 23321 components: - type: Transform pos: -67.5,-32.5 parent: 1 -- proto: SignChemistry2 - entities: - uid: 28641 components: - type: Transform @@ -234520,20 +235281,6 @@ entities: - type: Transform pos: -68.5,-61.5 parent: 1 -- proto: SignCourt - entities: - - uid: 11796 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -88.5,10.5 - parent: 1 - - uid: 28169 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -82.5,10.5 - parent: 1 - proto: SignCryogenicsMed entities: - uid: 1130 @@ -234562,6 +235309,19 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,7.5 parent: 1 +- proto: SignDirectionalAtmos + entities: + - uid: 32638 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -103.5,-24.5 + parent: 1 + - uid: 43115 + components: + - type: Transform + pos: -98.5,-25.5 + parent: 1 - proto: SignDirectionalBar entities: - uid: 6704 @@ -235292,13 +236052,6 @@ entities: - type: Transform pos: -5.5,24.5 parent: 1 -- proto: SignDrones - entities: - - uid: 9812 - components: - - type: Transform - pos: -112.5,-34.5 - parent: 1 - proto: SignElectrical entities: - uid: 15801 @@ -235591,11 +236344,6 @@ entities: - type: Transform pos: -12.5,16.5 parent: 1 - - uid: 9848 - components: - - type: Transform - pos: -122.5,-27.5 - parent: 1 - uid: 15807 components: - type: Transform @@ -235755,11 +236503,23 @@ entities: parent: 1 - proto: SignLawyer entities: + - uid: 11796 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -88.5,10.5 + parent: 1 - uid: 11949 components: - type: Transform pos: -86.5,-4.5 parent: 1 + - uid: 28169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -82.5,10.5 + parent: 1 - proto: SignLibrary entities: - uid: 2624 @@ -235786,6 +236546,13 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,35.5 parent: 1 +- proto: SignMaterials + entities: + - uid: 9812 + components: + - type: Transform + pos: -112.5,-34.5 + parent: 1 - proto: SignMedical entities: - uid: 16354 @@ -235866,11 +236633,6 @@ entities: parent: 1 - proto: SignRadiation entities: - - uid: 15795 - components: - - type: Transform - pos: 58.5,-57.5 - parent: 1 - uid: 15796 components: - type: Transform @@ -235891,6 +236653,11 @@ entities: - type: Transform pos: 54.5,-38.5 parent: 1 + - uid: 43153 + components: + - type: Transform + pos: 58.5,-58.5 + parent: 1 - proto: SignRedFive entities: - uid: 41237 @@ -236465,6 +237232,14 @@ entities: rot: 3.141592653589793 rad pos: -21.5,-73.5 parent: 1 +- proto: SmallLight + entities: + - uid: 15795 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 58.5,-54.5 + parent: 1 - proto: SmartFridge entities: - uid: 4707 @@ -236539,12 +237314,12 @@ entities: - type: Transform pos: -64.5,-42.5 parent: 1 - - uid: 10918 + - uid: 15247 components: - type: MetaData name: Particle Accelerator SMES - type: Transform - pos: 61.5,-56.5 + pos: 61.5,-57.5 parent: 1 - uid: 28642 components: @@ -236574,6 +237349,11 @@ entities: rot: 3.141592653589793 rad pos: -109.58488,-31.092873 parent: 1 + - uid: 20327 + components: + - type: Transform + pos: 61.46888,-53.30942 + parent: 1 - proto: SmokingPipeFilledCannabis entities: - uid: 11953 @@ -236593,6 +237373,14 @@ entities: - type: Transform pos: -58.56885,-41.41053 parent: 1 +- proto: SoapNT + entities: + - uid: 41017 + components: + - type: Transform + parent: 39881 + - type: Physics + canCollide: False - proto: SodaDispenser entities: - uid: 1531 @@ -238129,11 +238917,6 @@ entities: - type: Transform pos: -56.5,-27.5 parent: 1 - - uid: 36830 - components: - - type: Transform - pos: -126.5,-29.5 - parent: 1 - uid: 36831 components: - type: Transform @@ -239060,6 +239843,13 @@ entities: - type: Transform pos: -70.5,-27.5 parent: 1 +- proto: StationAnchor + entities: + - uid: 6644 + components: + - type: Transform + pos: -126.5,-29.5 + parent: 1 - proto: StationMap entities: - uid: 1827 @@ -239831,12 +240621,12 @@ entities: parent: 1 - proto: SubstationBasicEmpty entities: - - uid: 10920 + - uid: 18602 components: - type: MetaData name: particle accelerator substation - type: Transform - pos: 59.5,-56.5 + pos: 59.5,-57.5 parent: 1 - uid: 33510 components: @@ -242237,11 +243027,6 @@ entities: - type: Transform pos: -24.5,3.5 parent: 1 - - uid: 639 - components: - - type: Transform - pos: -34.5,-11.5 - parent: 1 - uid: 914 components: - type: Transform @@ -244199,12 +244984,6 @@ entities: - type: Transform pos: -104.5,4.5 parent: 1 - - uid: 9036 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -95.5,-39.5 - parent: 1 - uid: 9037 components: - type: Transform @@ -244360,24 +245139,12 @@ entities: rot: 1.5707963267948966 rad pos: 61.5,-50.5 parent: 1 - - uid: 10887 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 61.5,-49.5 - parent: 1 - uid: 10888 components: - type: Transform rot: 1.5707963267948966 rad pos: 59.5,-51.5 parent: 1 - - uid: 10889 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,-50.5 - parent: 1 - uid: 11081 components: - type: Transform @@ -246406,11 +247173,6 @@ entities: rot: 3.141592653589793 rad pos: -81.5,24.5 parent: 1 - - uid: 8781 - components: - - type: Transform - pos: -118.5,1.5 - parent: 1 - uid: 8949 components: - type: Transform @@ -246479,6 +247241,15 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,-72.5 parent: 1 +- proto: ToiletGoldenEmpty + entities: + - uid: 41196 + components: + - type: Transform + pos: -118.5,1.5 + parent: 1 + - type: StealTarget + stealGroup: ToiletGoldenDirtyWater - proto: ToolboxElectricalFilled entities: - uid: 9862 @@ -246825,96 +247596,29 @@ entities: parent: 1 - proto: TwoWayLever entities: - - uid: 11289 + - uid: 9641 components: - type: Transform pos: -11.5,24.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 11292: - - Left: Reverse - - Right: Forward - - Middle: Off - 6633: - - Left: Reverse - - Right: Forward - - Middle: Off - 6639: - - Left: Reverse - - Right: Forward - - Middle: Off - 6617: - - Left: Reverse - - Right: Forward - - Middle: Off - 6618: - - Left: Reverse - - Right: Forward - - Middle: Off - 6619: - - Left: Reverse - - Right: Forward - - Middle: Off - 6620: - - Left: Reverse - - Right: Forward - - Middle: Off - 6611: - - Left: Reverse - - Right: Forward - - Middle: Off - 6635: - - Left: Reverse - - Right: Forward - - Middle: Off - 15165: - - Left: Reverse - - Right: Forward + 12021: + - Left: Forward + - Right: Reverse - Middle: Off - 15166: - - Left: Reverse - - Right: Forward + 11292: + - Left: Forward + - Right: Reverse - Middle: Off - 15167: - - Left: Reverse - - Right: Forward + 11289: + - Left: Forward + - Right: Reverse - Middle: Off 15168: - - Left: Reverse - - Right: Forward - - Middle: Off - 15169: - - Left: Reverse - - Right: Forward - - Middle: Off - 15170: - - Left: Reverse - - Right: Forward - - Middle: Off - - uid: 12027 - components: - - type: Transform - pos: 15.5,-15.5 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 4394: - Left: Forward - Right: Reverse - Middle: Off - 12021: - - Left: Reverse - - Right: Forward - - Middle: Off - 12022: - - Left: Reverse - - Right: Forward - - Middle: Off - 12023: - - Left: Reverse - - Right: Forward - - Middle: Off - uid: 18589 components: - type: Transform @@ -246985,6 +247689,103 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 32633 + components: + - type: Transform + pos: -8.5,24.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 11108: + - Left: Forward + - Right: Reverse + - Middle: Off + 10515: + - Left: Forward + - Right: Reverse + - Middle: Off + 9639: + - Left: Forward + - Right: Reverse + - Middle: Off + 7123: + - Left: Forward + - Right: Reverse + - Middle: Off + 15170: + - Left: Forward + - Right: Reverse + - Middle: Off + 8781: + - Left: Forward + - Right: Reverse + - Middle: Off + 7158: + - Left: Forward + - Right: Reverse + - Middle: Off + 7157: + - Left: Forward + - Right: Reverse + - Middle: Off + 9640: + - Left: Forward + - Right: Reverse + - Middle: Off + 8967: + - Left: Forward + - Right: Reverse + - Middle: Off + 41217: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 32688 + components: + - type: Transform + pos: 14.5,-15.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 36830: + - Left: Forward + - Right: Reverse + - Middle: Off + 32629: + - Left: Forward + - Right: Reverse + - Middle: Off + 42850: + - Left: Forward + - Right: Reverse + - Middle: Off + 41407: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 36465 + components: + - type: Transform + pos: -5.5,50.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 9848: + - Left: Forward + - Right: Reverse + - Middle: Off + 9647: + - Left: Forward + - Right: Reverse + - Middle: Off + 9642: + - Left: Forward + - Right: Reverse + - Middle: Off + 12022: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 9849 @@ -256485,16 +257286,6 @@ entities: - type: Transform pos: 20.5,-11.5 parent: 1 - - uid: 7123 - components: - - type: Transform - pos: 21.5,-11.5 - parent: 1 - - uid: 7124 - components: - - type: Transform - pos: 22.5,-11.5 - parent: 1 - uid: 7125 components: - type: Transform @@ -259245,21 +260036,6 @@ entities: - type: Transform pos: 58.5,-57.5 parent: 1 - - uid: 10647 - components: - - type: Transform - pos: 59.5,-57.5 - parent: 1 - - uid: 10648 - components: - - type: Transform - pos: 60.5,-57.5 - parent: 1 - - uid: 10649 - components: - - type: Transform - pos: 61.5,-57.5 - parent: 1 - uid: 10650 components: - type: Transform @@ -259435,6 +260211,11 @@ entities: - type: Transform pos: 23.5,-52.5 parent: 1 + - uid: 10889 + components: + - type: Transform + pos: 58.5,-52.5 + parent: 1 - uid: 11022 components: - type: Transform @@ -264390,11 +265171,6 @@ entities: - type: Transform pos: 22.5,-2.5 parent: 1 - - uid: 39881 - components: - - type: Transform - pos: 58.5,-52.5 - parent: 1 - uid: 40049 components: - type: Transform @@ -264470,6 +265246,11 @@ entities: - type: Transform pos: -0.5,29.5 parent: 1 + - uid: 42863 + components: + - type: Transform + pos: -129.5,-33.5 + parent: 1 - uid: 43003 components: - type: Transform @@ -264480,6 +265261,26 @@ entities: - type: Transform pos: -97.5,-3.5 parent: 1 + - uid: 43149 + components: + - type: Transform + pos: 58.5,-58.5 + parent: 1 + - uid: 43150 + components: + - type: Transform + pos: 59.5,-58.5 + parent: 1 + - uid: 43151 + components: + - type: Transform + pos: 60.5,-58.5 + parent: 1 + - uid: 43152 + components: + - type: Transform + pos: 61.5,-58.5 + parent: 1 - proto: WallSolid entities: - uid: 301 @@ -266197,11 +266998,6 @@ entities: - type: Transform pos: -118.5,-8.5 parent: 1 - - uid: 3410 - components: - - type: Transform - pos: -122.5,-27.5 - parent: 1 - uid: 3415 components: - type: Transform @@ -271619,11 +272415,11 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 29517 + - uid: 34876 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 59.523373,-50.694332 + rot: 3.141592653589793 rad + pos: 61.595676,-50.803333 parent: 1 - proto: WeaponLauncherRocket entities: @@ -271758,7 +272554,7 @@ entities: - uid: 640 components: - type: Transform - pos: -34.71126,-10.728965 + pos: -34.640953,-10.110379 parent: 1 - uid: 947 components: @@ -272239,6 +273035,11 @@ entities: rot: 1.5707963267948966 rad pos: -136.5,-46.5 parent: 1 + - uid: 36459 + components: + - type: Transform + pos: 15.5,-15.5 + parent: 1 - uid: 36761 components: - type: Transform @@ -272422,23 +273223,11 @@ entities: parent: 1 - proto: WindoorSecureJanitorLocked entities: - - uid: 6615 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,23.5 - parent: 1 - - uid: 6644 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,23.5 - parent: 1 - - uid: 7158 + - uid: 7124 components: - type: Transform rot: 3.141592653589793 rad - pos: -6.5,23.5 + pos: -9.5,23.5 parent: 1 - uid: 29934 components: @@ -272582,6 +273371,22 @@ entities: parent: 1 - proto: WindoorSecureSecurityLawyerLocked entities: + - uid: 4241 + components: + - type: MetaData + name: secure windoor (with justice access) + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-35.5 + parent: 1 + - uid: 4242 + components: + - type: MetaData + name: secure windoor (with justice access) + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-36.5 + parent: 1 - uid: 7912 components: - type: Transform @@ -272600,6 +273405,12 @@ entities: rot: -1.5707963267948966 rad pos: -81.5,16.5 parent: 1 + - uid: 15400 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-28.5 + parent: 1 - uid: 29570 components: - type: Transform @@ -272663,12 +273474,6 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-53.5 parent: 1 - - uid: 3595 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,-28.5 - parent: 1 - uid: 3939 components: - type: MetaData @@ -272685,22 +273490,20 @@ entities: parent: 1 - uid: 4240 components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,-36.5 - parent: 1 - - uid: 4241 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,-35.5 - parent: 1 - - uid: 4242 - components: + - type: MetaData + name: secure windoor (security access only) - type: Transform rot: -1.5707963267948966 rad pos: -42.5,-34.5 parent: 1 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -325.88925 + state: Opening + - type: Airlock + autoClose: False - uid: 5792 components: - type: Transform @@ -275572,24 +276375,12 @@ entities: - type: Transform pos: -72.5,25.5 parent: 1 - - uid: 6632 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,23.5 - parent: 1 - uid: 6750 components: - type: Transform rot: 1.5707963267948966 rad pos: -114.5,-38.5 parent: 1 - - uid: 7157 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,23.5 - parent: 1 - uid: 7304 components: - type: Transform @@ -276154,6 +276945,11 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,23.5 parent: 1 + - uid: 36464 + components: + - type: Transform + pos: 14.5,-15.5 + parent: 1 - uid: 36471 components: - type: Transform @@ -276190,6 +276986,30 @@ entities: rot: 1.5707963267948966 rad pos: -122.5,-60.5 parent: 1 + - uid: 41810 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,23.5 + parent: 1 + - uid: 41989 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,23.5 + parent: 1 + - uid: 42849 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,23.5 + parent: 1 + - uid: 42851 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,23.5 + parent: 1 - uid: 42972 components: - type: Transform @@ -276201,6 +277021,11 @@ entities: - type: Transform pos: -89.5,19.5 parent: 1 + - uid: 43168 + components: + - type: Transform + pos: -42.5,-34.5 + parent: 1 - proto: WindowTintedDirectional entities: - uid: 4126 @@ -276377,11 +277202,6 @@ entities: parent: 1 - proto: Wrench entities: - - uid: 641 - components: - - type: Transform - pos: -34.50293,-10.572606 - parent: 1 - uid: 1226 components: - type: Transform @@ -276416,6 +277236,11 @@ entities: - type: Transform pos: -37.47136,-41.748615 parent: 1 + - uid: 13955 + components: + - type: Transform + pos: -34.58887,-10.464792 + parent: 1 - uid: 30614 components: - type: Transform From daa073761a5e2401fbf0a5b05a323f1575f0950f Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:22:18 -0500 Subject: [PATCH 024/561] adjust physics values (#1932) Co-authored-by: Velcroboy --- Resources/Maps/arena.yml | 7 ++----- Resources/Maps/hammurabi.yml | 7 ++----- Resources/Maps/hive.yml | 7 ++----- Resources/Maps/tortuga.yml | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 426a614bb1c..49b7daf6b60 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -530,8 +530,8 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures @@ -11356,9 +11356,6 @@ entities: - 0 chunkSize: 4 - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: RadiationGridResistance - type: BecomesStation diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index afe6e3c6d38..8918fe2f0d0 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -712,16 +712,13 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures fixtures: {} - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 3b87acf9188..400c13bc653 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -516,16 +516,13 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures fixtures: {} - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index d02e1724476..7b3ddc0bded 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -601,8 +601,8 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures @@ -12847,9 +12847,6 @@ entities: - type: BecomesStation id: Tortuga - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay From 093bd1fcaa8469e14a42791c4e21ffb2263c8604 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 08:24:49 +0000 Subject: [PATCH 025/561] Update Credits (#1934) 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 fb84cba4086..5b29400825b 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, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, asperger-sind, aspiringLich, astriloqua, AutoOtter, avalon, avghdev, Awlod, azzy, AzzyIsNotHere, backetako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, 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, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DakotaGay, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, 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, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, 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, joshepvodka, jproads, Jrpl, juliangiebel, justart1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, 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, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, 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, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, 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, pigeonpeas, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, 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, 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, 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, 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, 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, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zumorica, ZweiHawke, 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, 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, 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, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DakotaGay, 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, 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, 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, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, 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, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, 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, 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, pigeonpeas, 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, 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, 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, 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, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zumorica, ZweiHawke, Zymem, zzylex From ddcb2127784731a85b3fde4e5cafc982cfb306f0 Mon Sep 17 00:00:00 2001 From: Milon Date: Sun, 29 Sep 2024 16:24:09 +0200 Subject: [PATCH 026/561] cherry pick "Fix currency duplication bug (#32524)" (#1936) Fix currency duplication bug (#32524) Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> --- .../Implants/SubdermalImplantSystem.cs | 6 +-- Content.Server/Stack/StackSystem.cs | 14 +++++ .../Store/Components/CurrencyComponent.cs | 11 ++++ .../Store/Systems/StoreSystem.Ui.cs | 6 ++- Content.Server/Store/Systems/StoreSystem.cs | 51 ++++++++++++------- 5 files changed, 66 insertions(+), 22 deletions(-) diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 7c69ec8ea54..6e277dd29fb 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -74,14 +74,12 @@ private void OnStoreRelay(EntityUid uid, StoreComponent store, ImplantRelayEvent return; // same as store code, but message is only shown to yourself - args.Handled = _store.TryAddCurrency(_store.GetCurrencyValue(args.Used, currency), uid, store); - - if (!args.Handled) + if (!_store.TryAddCurrency((args.Used, currency), (uid, store))) return; + args.Handled = true; var msg = Loc.GetString("store-currency-inserted-implant", ("used", args.Used)); _popup.PopupEntity(msg, args.User, args.User); - QueueDel(args.Used); } private void OnFreedomImplant(EntityUid uid, SubdermalImplantComponent component, UseFreedomImplantEvent args) diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index b9553a6b849..bc1800ffd1e 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -100,6 +100,13 @@ public EntityUid Spawn(int amount, StackPrototype prototype, EntityCoordinates s /// public List SpawnMultiple(string entityPrototype, int amount, EntityCoordinates spawnPosition) { + if (amount <= 0) + { + Log.Error( + $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}"); + return new(); + } + var spawns = CalculateSpawns(entityPrototype, amount); var spawnedEnts = new List(); @@ -116,6 +123,13 @@ public List SpawnMultiple(string entityPrototype, int amount, EntityC /// public List SpawnMultiple(string entityPrototype, int amount, EntityUid target) { + if (amount <= 0) + { + Log.Error( + $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}"); + return new(); + } + var spawns = CalculateSpawns(entityPrototype, amount); var spawnedEnts = new List(); diff --git a/Content.Server/Store/Components/CurrencyComponent.cs b/Content.Server/Store/Components/CurrencyComponent.cs index cfe9b76c8bf..eb4ca1c0e36 100644 --- a/Content.Server/Store/Components/CurrencyComponent.cs +++ b/Content.Server/Store/Components/CurrencyComponent.cs @@ -8,6 +8,11 @@ namespace Content.Server.Store.Components; /// Identifies a component that can be inserted into a store /// to increase its balance. /// +/// +/// Note that if this entity is a stack of items, then this is meant to represent the value per stack item, not +/// the whole stack. This also means that in general, the actual value should not be modified from the initial +/// prototype value because otherwise stack merging/splitting may modify the total value. +/// [RegisterComponent] public sealed partial class CurrencyComponent : Component { @@ -16,6 +21,12 @@ public sealed partial class CurrencyComponent : Component /// The string is the currency type that will be added. /// The FixedPoint2 is the value of each individual currency entity. /// + /// + /// Note that if this entity is a stack of items, then this is meant to represent the value per stack item, not + /// the whole stack. This also means that in general, the actual value should not be modified from the initial + /// prototype value + /// because otherwise stack merging/splitting may modify the total value. + /// [ViewVariables(VVAccess.ReadWrite)] [DataField("price", customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] public Dictionary Price = new(); diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs index 247055c2a7f..51afa4ea56e 100644 --- a/Content.Server/Store/Systems/StoreSystem.Ui.cs +++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs @@ -284,6 +284,9 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi /// private void OnRequestWithdraw(EntityUid uid, StoreComponent component, StoreRequestWithdrawMessage msg) { + if (msg.Amount <= 0) + return; + //make sure we have enough cash in the bank and we actually support this currency if (!component.Balance.TryGetValue(msg.Currency, out var currentAmount) || currentAmount < msg.Amount) return; @@ -307,7 +310,8 @@ private void OnRequestWithdraw(EntityUid uid, StoreComponent component, StoreReq var cashId = proto.Cash[value]; var amountToSpawn = (int) MathF.Floor((float) (amountRemaining / value)); var ents = _stack.SpawnMultiple(cashId, amountToSpawn, coordinates); - _hands.PickupOrDrop(buyer, ents.First()); + if (ents.FirstOrDefault() is {} ent) + _hands.PickupOrDrop(buyer, ent); amountRemaining -= value * amountToSpawn; } diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index bf9e8a10ec9..33727fe37d1 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -92,14 +92,12 @@ private void OnAfterInteract(EntityUid uid, CurrencyComponent component, AfterIn if (ev.Cancelled) return; - args.Handled = TryAddCurrency(GetCurrencyValue(uid, component), args.Target.Value, store); + if (!TryAddCurrency((uid, component), (args.Target.Value, store))) + return; - if (args.Handled) - { - var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target)); - _popup.PopupEntity(msg, args.Target.Value, args.User); - QueueDel(args.Used); - } + args.Handled = true; + var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target)); + _popup.PopupEntity(msg, args.Target.Value, args.User); } private void OnImplantActivate(EntityUid uid, StoreComponent component, OpenUplinkImplantEvent args) @@ -111,6 +109,10 @@ private void OnImplantActivate(EntityUid uid, StoreComponent component, OpenUpli /// Gets the value from an entity's currency component. /// Scales with stacks. /// + /// + /// If this result is intended to be used with , + /// consider using instead to ensure that the currency is consumed in the process. + /// /// /// /// The value of the currency @@ -121,19 +123,34 @@ public Dictionary GetCurrencyValue(EntityUid uid, CurrencyC } /// - /// Tries to add a currency to a store's balance. + /// Tries to add a currency to a store's balance. Note that if successful, this will consume the currency in the process. /// - /// - /// - /// The currency to add - /// The store to add it to - /// Whether or not the currency was succesfully added - [PublicAPI] - public bool TryAddCurrency(EntityUid currencyEnt, EntityUid storeEnt, StoreComponent? store = null, CurrencyComponent? currency = null) + public bool TryAddCurrency(Entity currency, Entity store) { - if (!Resolve(currencyEnt, ref currency) || !Resolve(storeEnt, ref store)) + if (!Resolve(currency.Owner, ref currency.Comp)) + return false; + + if (!Resolve(store.Owner, ref store.Comp)) return false; - return TryAddCurrency(GetCurrencyValue(currencyEnt, currency), storeEnt, store); + + var value = currency.Comp.Price; + if (TryComp(currency.Owner, out StackComponent? stack) && stack.Count != 1) + { + value = currency.Comp.Price + .ToDictionary(v => v.Key, p => p.Value * stack.Count); + } + + if (!TryAddCurrency(value, store, store.Comp)) + return false; + + // Avoid having the currency accidentally be re-used. E.g., if multiple clients try to use the currency in the + // same tick + currency.Comp.Price.Clear(); + if (stack != null) + _stack.SetCount(currency.Owner, 0, stack); + + QueueDel(currency); + return true; } /// From debd5a9f29ac80013f93c0581f3cdd4b43195f78 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:51:42 -0500 Subject: [PATCH 027/561] Map Edits: Tortuga, The Hive (#1937) Co-authored-by: Velcroboy --- Resources/Maps/hive.yml | 804 +++++++++++++++++++++---------------- Resources/Maps/tortuga.yml | 580 ++++++++++++++++++-------- 2 files changed, 865 insertions(+), 519 deletions(-) diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 400c13bc653..58d5eb71518 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -307,7 +307,7 @@ entities: version: 6 -4,0: ind: -4,0 - tiles: fAAAAAAAfAAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAACfAAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACTgAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABfAAAAAAAfAAAAAAATgAAAAAAKwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACTgAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAABZQAAAAAATgAAAAAAXAAAAAADXAAAAAACTgAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAADZQAAAAADZQAAAAAAZQAAAAACZQAAAAAAZQAAAAACXAAAAAABXAAAAAADfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAAAZQAAAAADZQAAAAABTgAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAXAAAAAACawAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAADZQAAAAADZQAAAAABZQAAAAABTgAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAADfAAAAAAAZQAAAAAAawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAACXAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADfAAAAAAAZQAAAAACawAAAAAAfAAAAAAAXAAAAAAAXAAAAAABbQAAAAACXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADZQAAAAADZQAAAAADQQAAAAAAfAAAAAAAYwAAAAAAXAAAAAAAXAAAAAACYwAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYwAAAAAAYwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAAAfAAAAAAAZQAAAAABawAAAAAAawAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACfAAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAUQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAABXAAAAAACfAAAAAAAUQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAA + tiles: fAAAAAAAfAAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAACfAAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACTgAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABfAAAAAAAfAAAAAAATgAAAAAAKwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACTgAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAABZQAAAAAATgAAAAAAXAAAAAADXAAAAAACTgAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAADZQAAAAADZQAAAAAAZQAAAAACZQAAAAAAZQAAAAACXAAAAAABXAAAAAADfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAAAZQAAAAADZQAAAAABTgAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAXAAAAAACawAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAADZQAAAAADZQAAAAABZQAAAAABTgAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAADfAAAAAAAZQAAAAAAawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAACXAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADfAAAAAAAZQAAAAACawAAAAAAfAAAAAAAXAAAAAAAXAAAAAABbQAAAAACXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADZQAAAAADZQAAAAADQQAAAAAAfAAAAAAAYwAAAAAAXAAAAAAAXAAAAAACYwAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYwAAAAAAYwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAAAfAAAAAAAZQAAAAABawAAAAAAawAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACfAAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAUQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAABXAAAAAACfAAAAAAAUQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAA version: 6 -4,-2: ind: -4,-2 @@ -319,7 +319,7 @@ entities: version: 6 -4,1: ind: -4,1 - tiles: fAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAABXAAAAAACXAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAADXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAABXAAAAAADXAAAAAACXAAAAAABMwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAACXAAAAAADXAAAAAACXAAAAAADMwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAADXAAAAAADXAAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA + tiles: fAAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAABXAAAAAACXAAAAAABfAAAAAAAewAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAADXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAABXAAAAAADXAAAAAACXAAAAAABMwAAAAABewAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAACXAAAAAADXAAAAAACXAAAAAADMwAAAAADewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAADXAAAAAADXAAAAAAAMwAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA version: 6 -3,1: ind: -3,1 @@ -395,7 +395,7 @@ entities: version: 6 -5,1: ind: -5,1 - tiles: AAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA + tiles: AAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA version: 6 -5,2: ind: -5,2 @@ -10945,13 +10945,18 @@ entities: -16,2: 0: 7647 -16,3: - 0: 8183 + 0: 40951 + -16,4: + 0: 36044 + 1: 4368 -15,1: 0: 45277 -15,2: 0: 13243 -15,3: 0: 4080 + -15,4: + 0: 4369 -14,1: 0: 61559 -14,2: @@ -11019,11 +11024,18 @@ entities: 0: 62379 -10,-9: 0: 30579 + -17,4: + 1: 128 + -16,5: + 1: 4369 + 0: 34952 -16,6: - 1: 15 - 0: 32768 + 1: 817 + 0: 32904 + -17,5: + 1: 32768 -17,6: - 1: 15 + 1: 2063 -16,7: 0: 52367 1: 4352 @@ -11033,14 +11045,13 @@ entities: -16,8: 1: 17153 0: 140 + -15,5: + 0: 4369 + 3: 2048 -15,6: - 1: 17 - 0: 64716 + 0: 64735 -15,7: 0: 65535 - -15,5: - 1: 4096 - 3: 2048 -15,8: 0: 65535 -14,5: @@ -12046,6 +12057,7 @@ entities: - type: BecomesStation id: TheHive - type: SpreaderGrid + - type: Shuttle - uid: 8 components: - type: MetaData @@ -13005,6 +13017,8 @@ entities: - 10844 - 10843 - 10866 + - 673 + - 28529 - uid: 22250 components: - type: Transform @@ -15757,6 +15771,11 @@ entities: - type: Transform pos: -35.5,25.5 parent: 1 + - uid: 6505 + components: + - type: Transform + pos: -58.5,24.5 + parent: 1 - proto: AirlockMaintBarLocked entities: - uid: 2896 @@ -15873,6 +15892,11 @@ entities: rot: 1.5707963267948966 rad pos: -63.5,-2.5 parent: 1 + - uid: 3827 + components: + - type: Transform + pos: -60.5,15.5 + parent: 1 - uid: 4617 components: - type: Transform @@ -17472,6 +17496,15 @@ entities: - 28339 - 28342 - 28341 + - uid: 28529 + components: + - type: Transform + pos: -60.5,20.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22248 + - 22249 - proto: AirTankFilled entities: - uid: 12467 @@ -21424,12 +21457,12 @@ entities: - uid: 121 components: - type: Transform - pos: -62.5,12.5 + pos: -63.5,13.5 parent: 1 - uid: 183 components: - type: Transform - pos: -61.5,13.5 + pos: -62.5,14.5 parent: 1 - uid: 189 components: @@ -21891,6 +21924,11 @@ entities: - type: Transform pos: -10.5,-8.5 parent: 1 + - uid: 5030 + components: + - type: Transform + pos: -63.5,14.5 + parent: 1 - uid: 5053 components: - type: Transform @@ -21961,6 +21999,46 @@ entities: - type: Transform pos: 30.5,5.5 parent: 1 + - uid: 6415 + components: + - type: Transform + pos: -61.5,14.5 + parent: 1 + - uid: 6417 + components: + - type: Transform + pos: -60.5,20.5 + parent: 1 + - uid: 6531 + components: + - type: Transform + pos: -60.5,17.5 + parent: 1 + - uid: 6532 + components: + - type: Transform + pos: -60.5,22.5 + parent: 1 + - uid: 6534 + components: + - type: Transform + pos: -60.5,21.5 + parent: 1 + - uid: 6538 + components: + - type: Transform + pos: -60.5,15.5 + parent: 1 + - uid: 6539 + components: + - type: Transform + pos: -60.5,19.5 + parent: 1 + - uid: 6588 + components: + - type: Transform + pos: -60.5,16.5 + parent: 1 - uid: 6614 components: - type: Transform @@ -22006,6 +22084,11 @@ entities: - type: Transform pos: 31.5,19.5 parent: 1 + - uid: 7186 + components: + - type: Transform + pos: -60.5,14.5 + parent: 1 - uid: 7221 components: - type: Transform @@ -23004,17 +23087,12 @@ entities: - uid: 17638 components: - type: Transform - pos: -61.5,12.5 + pos: -60.5,23.5 parent: 1 - uid: 17640 components: - type: Transform - pos: -60.5,13.5 - parent: 1 - - uid: 17641 - components: - - type: Transform - pos: -59.5,13.5 + pos: -60.5,18.5 parent: 1 - uid: 17642 components: @@ -57864,6 +57942,12 @@ entities: rot: -1.5707963267948966 rad pos: 78.735176,31.755037 parent: 1 + - uid: 28517 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.30682,22.872543 + parent: 1 - proto: ChairFoldingSpawnFolded entities: - uid: 2989 @@ -59658,10 +59742,10 @@ entities: - type: Transform pos: 2.5,-49.5 parent: 1 - - uid: 6505 + - uid: 639 components: - type: Transform - pos: -57.5,24.5 + pos: -56.5,38.5 parent: 1 - uid: 6783 components: @@ -60390,6 +60474,14 @@ entities: - type: Transform pos: 48.5,-8.5 parent: 1 +- proto: ClothingBackpackElectropack + entities: + - uid: 3797 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 64.49539,19.696146 + parent: 1 - proto: ClothingBeltBandolier entities: - uid: 3253 @@ -60959,14 +61051,6 @@ entities: rot: -1.5707963267948966 rad pos: -7.9991593,-34.16382 parent: 1 -- proto: ClothingNeckShockCollar - entities: - - uid: 3797 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 64.49539,19.696146 - parent: 1 - proto: ClothingNeckStethoscope entities: - uid: 7360 @@ -61220,6 +61304,16 @@ entities: - type: Transform pos: -4.4101806,34.616287 parent: 1 + - uid: 28530 + components: + - type: Transform + pos: -40.5154,-1.4141922 + parent: 1 + - uid: 28531 + components: + - type: Transform + pos: -41.525818,-1.4871597 + parent: 1 - proto: ClothingShoesSlippers entities: - uid: 5382 @@ -62749,6 +62843,11 @@ entities: - type: Transform pos: 94.5,-21.5 parent: 1 + - uid: 28508 + components: + - type: Transform + pos: -59.5,25.5 + parent: 1 - proto: CrateEngineeringAMEJar entities: - uid: 6393 @@ -63542,6 +63641,23 @@ entities: - type: Transform pos: -40.5,13.5 parent: 1 +- proto: CurtainsOrangeOpen + entities: + - uid: 6530 + components: + - type: Transform + pos: -59.5,-2.5 + parent: 1 + - uid: 16018 + components: + - type: Transform + pos: -58.5,-2.5 + parent: 1 + - uid: 17641 + components: + - type: Transform + pos: -60.5,-2.5 + parent: 1 - proto: CurtainSpawner entities: - uid: 12360 @@ -64283,6 +64399,8 @@ entities: - type: Transform pos: -60.5,3.5 parent: 1 + - type: NavMapBeacon + text: Anchor - proto: DefaultStationBeaconTheater entities: - uid: 25893 @@ -76527,63 +76645,7 @@ entities: - type: Transform pos: -13.006062,36.40738 parent: 1 -- proto: EncryptionKeyCargo - entities: - - uid: 6540 - components: - - type: Transform - parent: 6538 - - type: Physics - canCollide: False -- proto: EncryptionKeyCommand - entities: - - uid: 6533 - components: - - type: Transform - parent: 6532 - - type: Physics - canCollide: False -- proto: EncryptionKeyCommon - entities: - - uid: 6542 - components: - - type: Transform - parent: 6541 - - type: Physics - canCollide: False -- proto: EncryptionKeyEngineering - entities: - - uid: 21478 - components: - - type: Transform - parent: 6530 - - type: Physics - canCollide: False -- proto: EncryptionKeyJustice - entities: - - uid: 28392 - components: - - type: Transform - parent: 6534 - - type: Physics - canCollide: False -- proto: EncryptionKeyMedical - entities: - - uid: 6417 - components: - - type: Transform - parent: 6415 - - type: Physics - canCollide: False - proto: EncryptionKeyRobo - entities: - - uid: 6531 - components: - - type: Transform - parent: 6536 - - type: Physics - canCollide: False -- proto: EncryptionKeyScience entities: - uid: 6537 components: @@ -76591,22 +76653,6 @@ entities: parent: 6536 - type: Physics canCollide: False -- proto: EncryptionKeySecurity - entities: - - uid: 6535 - components: - - type: Transform - parent: 6534 - - type: Physics - canCollide: False -- proto: EncryptionKeyService - entities: - - uid: 6539 - components: - - type: Transform - parent: 6538 - - type: Physics - canCollide: False - proto: ExosuitFabricator entities: - uid: 7339 @@ -77081,6 +77127,11 @@ entities: - type: Transform pos: 74.5,18.5 parent: 1 + - uid: 28513 + components: + - type: Transform + pos: -61.5,17.5 + parent: 1 - proto: filingCabinetRandom entities: - uid: 2002 @@ -77885,6 +77936,8 @@ entities: - 22246 - 22244 - 22245 + - 673 + - 28529 - uid: 22251 components: - type: Transform @@ -78447,6 +78500,15 @@ entities: parent: 1 - proto: Firelock entities: + - uid: 673 + components: + - type: Transform + pos: -58.5,24.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22248 + - 22249 - uid: 1302 components: - type: Transform @@ -80711,15 +80773,15 @@ entities: parent: 1 - proto: Floodlight entities: - - uid: 15759 + - uid: 6542 components: - type: Transform - pos: -47.93802,-4.385198 + pos: -38.65661,-12.441925 parent: 1 - - uid: 16018 + - uid: 15759 components: - type: Transform - pos: -39.255226,-12.371965 + pos: -47.93802,-4.385198 parent: 1 - uid: 16391 components: @@ -81379,6 +81441,12 @@ entities: rot: 1.5707963267948966 rad pos: 45.37556,8.424944 parent: 1 + - uid: 28512 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -60.973488,16.837103 + parent: 1 - proto: FoodApple entities: - uid: 16795 @@ -123870,6 +123938,11 @@ entities: - type: Transform pos: -65.5,33.5 parent: 1 + - uid: 6535 + components: + - type: Transform + pos: 66.5,1.5 + parent: 1 - uid: 6558 components: - type: Transform @@ -124105,11 +124178,6 @@ entities: - type: Transform pos: 65.5,1.5 parent: 1 - - uid: 7181 - components: - - type: Transform - pos: 66.5,1.5 - parent: 1 - uid: 7182 components: - type: Transform @@ -127685,6 +127753,51 @@ entities: - type: Transform pos: 145.5,3.5 parent: 1 + - uid: 28487 + components: + - type: Transform + pos: -58.5,20.5 + parent: 1 + - uid: 28488 + components: + - type: Transform + pos: -58.5,19.5 + parent: 1 + - uid: 28489 + components: + - type: Transform + pos: -58.5,18.5 + parent: 1 + - uid: 28490 + components: + - type: Transform + pos: -58.5,17.5 + parent: 1 + - uid: 28491 + components: + - type: Transform + pos: -58.5,16.5 + parent: 1 + - uid: 28495 + components: + - type: Transform + pos: -61.5,24.5 + parent: 1 + - uid: 28496 + components: + - type: Transform + pos: -61.5,23.5 + parent: 1 + - uid: 28497 + components: + - type: Transform + pos: -61.5,22.5 + parent: 1 + - uid: 28498 + components: + - type: Transform + pos: -61.5,21.5 + parent: 1 - proto: GrilleBroken entities: - uid: 10310 @@ -130795,6 +130908,12 @@ entities: - type: Transform pos: 100.5,-5.5 parent: 1 + - uid: 28519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,20.5 + parent: 1 - proto: LootSpawnerIndustrialFluff entities: - uid: 26860 @@ -130802,6 +130921,21 @@ entities: - type: Transform pos: 98.5,-12.5 parent: 1 +- proto: LootSpawnerMaterialsSurplus + entities: + - uid: 28518 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,16.5 + parent: 1 +- proto: LootSpawnerRandomCrateEngineering + entities: + - uid: 28507 + components: + - type: Transform + pos: -60.5,25.5 + parent: 1 - proto: LunchboxServiceFilledRandom entities: - uid: 28399 @@ -130940,6 +131074,11 @@ entities: - type: Transform pos: 97.5,-22.5 parent: 1 + - uid: 28510 + components: + - type: Transform + pos: -61.5,16.5 + parent: 1 - proto: MachineParticleAcceleratorEndCapCircuitboard entities: - uid: 24539 @@ -132295,6 +132434,11 @@ entities: - type: StepTriggerActive - proto: Multitool entities: + - uid: 672 + components: + - type: Transform + pos: -64.03919,15.593154 + parent: 1 - uid: 2562 components: - type: Transform @@ -132322,11 +132466,6 @@ entities: rot: -1.5707963267948966 rad pos: -63.493557,30.22321 parent: 1 - - uid: 15819 - components: - - type: Transform - pos: -61.104473,14.268036 - parent: 1 - uid: 23468 components: - type: Transform @@ -138063,6 +138202,14 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 + - uid: 6533 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -60.5,-3.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 - uid: 6807 components: - type: Transform @@ -139061,8 +139208,20 @@ entities: rot: 1.5707963267948966 rad pos: 90.5,7.5 parent: 1 + - uid: 28506 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,25.5 + parent: 1 - proto: PoweredSmallLightMaintenanceRed entities: + - uid: 680 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,16.5 + parent: 1 - uid: 910 components: - type: Transform @@ -140632,12 +140791,6 @@ entities: - type: Transform pos: 85.5,-20.5 parent: 1 - - uid: 20580 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 123.5,5.5 - parent: 1 - uid: 21448 components: - type: Transform @@ -140849,6 +141002,11 @@ entities: rot: -1.5707963267948966 rad pos: 100.5,-10.5 parent: 1 + - uid: 28509 + components: + - type: Transform + pos: -61.5,18.5 + parent: 1 - proto: RadiationCollector entities: - uid: 24370 @@ -141747,6 +141905,11 @@ entities: - type: Transform pos: -0.5,-26.5 parent: 1 + - uid: 28515 + components: + - type: Transform + pos: -61.5,18.5 + parent: 1 - proto: RandomBook entities: - uid: 5519 @@ -142380,12 +142543,6 @@ entities: - type: Transform pos: 35.5,8.5 parent: 1 - - uid: 22631 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 123.5,5.5 - parent: 1 - uid: 22680 components: - type: Transform @@ -142717,6 +142874,11 @@ entities: - type: Transform pos: -3.5,-17.5 parent: 1 + - uid: 28514 + components: + - type: Transform + pos: -61.5,19.5 + parent: 1 - proto: RandomPosterLegit entities: - uid: 3219 @@ -143013,6 +143175,13 @@ entities: - type: Transform pos: -22.5,25.5 parent: 1 +- proto: RandomSoakedCigarette + entities: + - uid: 28516 + components: + - type: Transform + pos: -61.83807,18.025427 + parent: 1 - proto: RandomSoap entities: - uid: 6344 @@ -143300,6 +143469,11 @@ entities: - type: Transform pos: -13.5,32.5 parent: 1 + - uid: 28511 + components: + - type: Transform + pos: -59.5,23.5 + parent: 1 - proto: RandomVending entities: - uid: 7064 @@ -147548,6 +147722,51 @@ entities: - type: Transform pos: 79.5,40.5 parent: 1 + - uid: 28520 + components: + - type: Transform + pos: -58.5,16.5 + parent: 1 + - uid: 28521 + components: + - type: Transform + pos: -58.5,17.5 + parent: 1 + - uid: 28522 + components: + - type: Transform + pos: -58.5,18.5 + parent: 1 + - uid: 28523 + components: + - type: Transform + pos: -58.5,19.5 + parent: 1 + - uid: 28524 + components: + - type: Transform + pos: -58.5,20.5 + parent: 1 + - uid: 28525 + components: + - type: Transform + pos: -61.5,24.5 + parent: 1 + - uid: 28526 + components: + - type: Transform + pos: -61.5,23.5 + parent: 1 + - uid: 28527 + components: + - type: Transform + pos: -61.5,22.5 + parent: 1 + - uid: 28528 + components: + - type: Transform + pos: -61.5,21.5 + parent: 1 - proto: RemoteSignaller entities: - uid: 11599 @@ -150110,7 +150329,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 17115: + 6533: - Status: Toggle - uid: 17178 components: @@ -151736,13 +151955,6 @@ entities: - type: Transform pos: 78.5,-19.5 parent: 1 -- proto: SignTelecomms - entities: - - uid: 6588 - components: - - type: Transform - pos: -60.5,6.5 - parent: 1 - proto: SignToolStorage entities: - uid: 26236 @@ -154812,6 +155024,13 @@ entities: - type: Transform pos: -61.51701,-0.9163426 parent: 1 +- proto: StationAnchor + entities: + - uid: 7181 + components: + - type: Transform + pos: -60.5,4.5 + parent: 1 - proto: StationMap entities: - uid: 20588 @@ -155767,7 +155986,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Telecomms Server Room + id: Station Anchor Room - uid: 618 components: - type: Transform @@ -155811,16 +156030,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Battery Room - - uid: 680 - components: - - type: Transform - pos: -57.5,24.5 - parent: 1 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Atmos 2 - uid: 716 components: - type: Transform @@ -155875,6 +156084,16 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Hallway-(Engine) + - uid: 28504 + components: + - type: Transform + pos: -52.5,24.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos 2 - proto: SurveillanceCameraGeneral entities: - uid: 2984 @@ -160201,103 +160420,19 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-37.5 parent: 1 -- proto: TelecomServer +- proto: TelecomServerCircuitboard entities: - - uid: 6415 - components: - - type: MetaData - name: medical telecommunication server - - type: Transform - pos: -61.5,3.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6417 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6530 - components: - - type: MetaData - name: engineering telecommunication server - - type: Transform - pos: -59.5,5.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 21478 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6532 - components: - - type: MetaData - name: command telecommunication server - - type: Transform - pos: -60.5,5.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6533 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6534 + - uid: 6571 components: - - type: MetaData - name: security telecommunication server - type: Transform - pos: -61.5,5.5 + pos: -61.504536,-1.4635959 parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6535 - - 28392 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] +- proto: TelecomServerFilled + entities: - uid: 6536 components: - - type: MetaData - name: epistemics telecommunication server - type: Transform - pos: -59.5,3.5 + pos: 123.5,5.5 parent: 1 - type: ContainerContainer containers: @@ -160306,52 +160441,6 @@ entities: occludes: True ents: - 6537 - - 6531 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6538 - components: - - type: MetaData - name: logistics/service telecommunication server - - type: Transform - pos: -61.5,2.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6540 - - 6539 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6541 - components: - - type: MetaData - name: common telecommunication server - - type: Transform - pos: -59.5,2.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6542 machine_board: !type:Container showEnts: False occludes: True @@ -160360,13 +160449,6 @@ entities: showEnts: False occludes: True ents: [] -- proto: TelecomServerCircuitboard - entities: - - uid: 6571 - components: - - type: Transform - pos: -61.504536,-1.4635959 - parent: 1 - proto: ThermomachineHeaterMachineCircuitBoard entities: - uid: 6499 @@ -161030,11 +161112,6 @@ entities: - type: Transform pos: -11.5,10.5 parent: 1 - - uid: 15813 - components: - - type: Transform - pos: -60.5,14.5 - parent: 1 - uid: 20597 components: - type: Transform @@ -161056,6 +161133,11 @@ entities: rot: 1.5707963267948966 rad pos: 97.5,-15.5 parent: 1 + - uid: 28505 + components: + - type: Transform + pos: -58.5,13.5 + parent: 1 - proto: UniformJabroni entities: - uid: 15982 @@ -162683,11 +162765,6 @@ entities: - type: Transform pos: -59.5,-7.5 parent: 1 - - uid: 639 - components: - - type: Transform - pos: -60.5,-7.5 - parent: 1 - uid: 649 components: - type: Transform @@ -162738,16 +162815,6 @@ entities: - type: Transform pos: -65.5,10.5 parent: 1 - - uid: 672 - components: - - type: Transform - pos: -60.5,15.5 - parent: 1 - - uid: 673 - components: - - type: Transform - pos: -59.5,15.5 - parent: 1 - uid: 674 components: - type: Transform @@ -166053,11 +166120,6 @@ entities: - type: Transform pos: -58.5,26.5 parent: 1 - - uid: 3682 - components: - - type: Transform - pos: -58.5,24.5 - parent: 1 - uid: 3687 components: - type: Transform @@ -166523,16 +166585,6 @@ entities: - type: Transform pos: -64.5,-5.5 parent: 1 - - uid: 3827 - components: - - type: Transform - pos: -62.5,15.5 - parent: 1 - - uid: 3828 - components: - - type: Transform - pos: -61.5,15.5 - parent: 1 - uid: 3830 components: - type: Transform @@ -167963,11 +168015,6 @@ entities: - type: Transform pos: -41.5,-13.5 parent: 1 - - uid: 5030 - components: - - type: Transform - pos: -40.5,-13.5 - parent: 1 - uid: 5033 components: - type: Transform @@ -169663,6 +169710,11 @@ entities: - type: Transform pos: -20.5,27.5 parent: 1 + - uid: 6541 + components: + - type: Transform + pos: -40.5,-13.5 + parent: 1 - uid: 6554 components: - type: Transform @@ -173638,11 +173690,6 @@ entities: - type: Transform pos: -63.5,-7.5 parent: 1 - - uid: 22836 - components: - - type: Transform - pos: -62.5,-7.5 - parent: 1 - uid: 22838 components: - type: Transform @@ -174768,6 +174815,46 @@ entities: - type: Transform pos: -3.5,-52.5 parent: 1 + - uid: 28492 + components: + - type: Transform + pos: -58.5,21.5 + parent: 1 + - uid: 28493 + components: + - type: Transform + pos: -58.5,22.5 + parent: 1 + - uid: 28494 + components: + - type: Transform + pos: -61.5,25.5 + parent: 1 + - uid: 28499 + components: + - type: Transform + pos: -61.5,20.5 + parent: 1 + - uid: 28500 + components: + - type: Transform + pos: -61.5,19.5 + parent: 1 + - uid: 28501 + components: + - type: Transform + pos: -62.5,19.5 + parent: 1 + - uid: 28502 + components: + - type: Transform + pos: -62.5,18.5 + parent: 1 + - uid: 28503 + components: + - type: Transform + pos: -62.5,17.5 + parent: 1 - proto: WallSolid entities: - uid: 2 @@ -177890,6 +177977,11 @@ entities: - type: Transform pos: 32.5,38.5 parent: 1 + - uid: 3682 + components: + - type: Transform + pos: -62.5,-7.5 + parent: 1 - uid: 3686 components: - type: Transform @@ -177920,6 +178012,11 @@ entities: - type: Transform pos: 87.5,14.5 parent: 1 + - uid: 3828 + components: + - type: Transform + pos: -61.5,15.5 + parent: 1 - uid: 3875 components: - type: Transform @@ -180190,6 +180287,16 @@ entities: - type: Transform pos: -62.5,7.5 parent: 1 + - uid: 15813 + components: + - type: Transform + pos: -62.5,15.5 + parent: 1 + - uid: 15819 + components: + - type: Transform + pos: -59.5,15.5 + parent: 1 - uid: 16127 components: - type: Transform @@ -180705,6 +180812,11 @@ entities: - type: Transform pos: -64.5,11.5 parent: 1 + - uid: 22836 + components: + - type: Transform + pos: -60.5,-7.5 + parent: 1 - uid: 23448 components: - type: Transform @@ -182370,7 +182482,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17132.03 + secondsUntilStateChange: -22246.982 state: Opening - uid: 5096 components: @@ -182392,7 +182504,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17132.03 + secondsUntilStateChange: -22246.982 state: Opening - uid: 5498 components: @@ -182408,7 +182520,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -16855.646 + secondsUntilStateChange: -21970.6 state: Opening - uid: 8696 components: @@ -182441,7 +182553,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -16853.764 + secondsUntilStateChange: -21968.717 state: Opening - uid: 18835 components: @@ -182453,7 +182565,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -16850.764 + secondsUntilStateChange: -21965.717 state: Opening - uid: 23917 components: @@ -183192,6 +183304,11 @@ entities: - type: Transform pos: -44.5,11.5 parent: 1 + - uid: 6540 + components: + - type: Transform + pos: 66.5,1.5 + parent: 1 - uid: 6740 components: - type: Transform @@ -183247,11 +183364,6 @@ entities: - type: Transform pos: 65.5,1.5 parent: 1 - - uid: 7186 - components: - - type: Transform - pos: 66.5,1.5 - parent: 1 - uid: 7187 components: - type: Transform diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index 7b3ddc0bded..08b5b78eb7d 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -284,7 +284,7 @@ entities: version: 6 3,1: ind: 3,1 - tiles: fAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAANwAAAAAANwAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAANwAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAANwAAAAAANwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAABfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAABQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAACfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfAAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAACfAAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAABTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAAANwAAAAAANwAAAAAANwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAAANwAAAAAANwAAAAAANwAAAAAATgAAAAAAXAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAATQAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAXAAAAAABfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAABQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAACfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfAAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAACfAAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAABTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,2: ind: 3,2 @@ -484,7 +484,7 @@ entities: version: 6 4,1: ind: 4,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAA version: 6 5,1: ind: 5,1 @@ -11039,8 +11039,8 @@ entities: 0: 65535 7,16: 0: 255 - 3: 32768 - 4: 8192 + 4: 32768 + 6: 8192 8,12: 0: 30583 8,13: @@ -11291,10 +11291,10 @@ entities: 13,8: 0: 13071 14,4: - 1: 34947 - 0: 13056 + 1: 3 + 0: 64256 14,5: - 0: 45107 + 0: 45243 14,6: 0: 48059 14,7: @@ -11303,17 +11303,17 @@ entities: 0: 3 1: 35976 15,4: - 1: 3840 + 0: 30464 15,5: - 0: 12288 - 1: 34816 + 0: 12407 + 1: 32768 15,6: 0: 13107 1: 8 16,4: - 1: 3840 + 1: 7952 16,5: - 1: 61440 + 1: 61696 12,9: 0: 65535 11,9: @@ -11507,8 +11507,8 @@ entities: 0: 4359 8,16: 0: 255 - 5: 8192 - 6: 32768 + 3: 8192 + 5: 32768 9,12: 0: 14327 9,13: @@ -11521,7 +11521,7 @@ entities: 0: 30583 9,16: 0: 255 - 6: 40960 + 5: 40960 10,12: 0: 2032 10,13: @@ -11534,7 +11534,7 @@ entities: 0: 65535 10,16: 0: 255 - 6: 40960 + 5: 40960 11,12: 0: 30583 11,13: @@ -12068,11 +12068,11 @@ entities: 23,13: 0: 4369 8,17: - 5: 34 - 6: 136 + 3: 34 + 5: 136 7,17: - 3: 136 - 4: 34 + 4: 136 + 6: 34 8,18: 1: 61471 7,18: @@ -12086,7 +12086,7 @@ entities: 9,19: 1: 29936 9,17: - 6: 170 + 5: 170 9,20: 1: 62579 10,18: @@ -12094,7 +12094,7 @@ entities: 10,19: 1: 17532 10,17: - 6: 170 + 5: 170 10,20: 1: 29764 11,18: @@ -12786,10 +12786,10 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -12801,7 +12801,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - 6666.982 - 0 - 0 @@ -12813,13 +12812,14 @@ entities: - 0 - 0 - 0 + - 0 - volume: 2500 temperature: 293.15 moles: - 0 - 0 - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -12832,7 +12832,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -12851,6 +12851,7 @@ entities: - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid + - type: Shuttle - uid: 35 components: - type: MetaData @@ -15504,6 +15505,11 @@ entities: - type: Transform pos: 51.5,22.5 parent: 33 + - uid: 31594 + components: + - type: Transform + pos: 58.5,19.5 + parent: 33 - proto: AirlockChiefEngineerLocked entities: - uid: 8824 @@ -21596,6 +21602,13 @@ entities: parent: 31457 - type: Physics canCollide: False +- proto: Biofabricator + entities: + - uid: 8298 + components: + - type: Transform + pos: -19.5,38.5 + parent: 33 - proto: BiomassReclaimer entities: - uid: 4088 @@ -41585,6 +41598,26 @@ entities: - type: Transform pos: 56.5,-22.5 parent: 33 + - uid: 31597 + components: + - type: Transform + pos: 57.5,19.5 + parent: 33 + - uid: 31598 + components: + - type: Transform + pos: 58.5,19.5 + parent: 33 + - uid: 31599 + components: + - type: Transform + pos: 59.5,19.5 + parent: 33 + - uid: 31600 + components: + - type: Transform + pos: 59.5,20.5 + parent: 33 - proto: CableApcStack entities: - uid: 8123 @@ -63210,11 +63243,6 @@ entities: - type: Transform pos: -60.5,45.5 parent: 33 - - uid: 26995 - components: - - type: Transform - pos: 26.5,65.5 - parent: 33 - uid: 27705 components: - type: Transform @@ -65462,6 +65490,11 @@ entities: rot: -1.5707963267948966 rad pos: 34.5,18.5 parent: 33 + - uid: 3182 + components: + - type: Transform + pos: 26.5,65.5 + parent: 33 - uid: 3328 components: - type: Transform @@ -65825,14 +65858,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,-17.5 parent: 33 -- proto: ComputerShuttleSalvage - entities: - - uid: 23868 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 59.5,-8.5 - parent: 33 - proto: ComputerSolarControl entities: - uid: 676 @@ -67532,29 +67557,11 @@ entities: - 0 - proto: CrateHydroponicsSeedsMedicinal entities: - - uid: 3182 + - uid: 31616 components: - type: Transform - pos: -19.5,38.5 + pos: -19.48779,34.864456 parent: 33 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 9.117112 - - 34.29771 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateLivestock entities: - uid: 18614 @@ -68567,6 +68574,13 @@ entities: - type: Transform pos: 31.5,22.5 parent: 33 + - uid: 31596 + components: + - type: Transform + pos: 60.5,19.5 + parent: 33 + - type: NavMapBeacon + text: Anchor - proto: DefaultStationBeaconEngiOutpost entities: - uid: 11248 @@ -86478,18 +86492,6 @@ entities: - type: Transform pos: -9.06601,26.59333 parent: 33 -- proto: FoodMeat - entities: - - uid: 8318 - components: - - type: Transform - pos: -5.5087547,44.53925 - parent: 33 - - uid: 8319 - components: - - type: Transform - pos: -5.4879217,44.476707 - parent: 33 - proto: FoodMeatChicken entities: - uid: 6653 @@ -86569,23 +86571,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodMeatChickenCutlet - entities: - - uid: 8322 - components: - - type: Transform - pos: -0.5508643,38.61676 - parent: 33 - - uid: 8323 - components: - - type: Transform - pos: -0.46753103,38.491673 - parent: 33 - - uid: 27307 - components: - - type: Transform - pos: -0.49878103,38.56464 - parent: 33 - proto: FoodMeatChickenFried entities: - uid: 6669 @@ -86621,28 +86606,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodMeatMeatball - entities: - - uid: 8313 - components: - - type: Transform - pos: -1.5913324,38.67354 - parent: 33 - - uid: 8314 - components: - - type: Transform - pos: -1.4142492,38.590145 - parent: 33 - - uid: 8315 - components: - - type: Transform - pos: -1.5496657,38.465057 - parent: 33 - - uid: 8316 - components: - - type: Transform - pos: -1.3309157,38.465057 - parent: 33 - proto: FoodMeatRotten entities: - uid: 10681 @@ -90328,6 +90291,53 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 31602 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31603 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31604 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 57.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31605 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31606 + components: + - type: Transform + pos: 59.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31607 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 59.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeFourway entities: - uid: 2955 @@ -117715,14 +117725,6 @@ entities: parent: 33 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 29089 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 55.5,20.5 - parent: 33 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 29090 components: - type: Transform @@ -117739,14 +117741,6 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 29092 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 56.5,20.5 - parent: 33 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 29093 components: - type: Transform @@ -119437,6 +119431,54 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 31608 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 58.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31609 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 56.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31610 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31611 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31612 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 31613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeTJunction entities: - uid: 633 @@ -119584,6 +119626,22 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 8322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8323 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 9506 components: - type: Transform @@ -125837,6 +125895,13 @@ entities: parent: 33 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 31614 + components: + - type: Transform + pos: 59.5,21.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentScrubber entities: - uid: 1551 @@ -127792,6 +127857,14 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 31615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 59.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVolumePump entities: - uid: 4166 @@ -134888,6 +134961,16 @@ entities: - type: Transform pos: 0.5,70.5 parent: 33 + - uid: 29089 + components: + - type: Transform + pos: 58.5,20.5 + parent: 33 + - uid: 29092 + components: + - type: Transform + pos: 61.5,17.5 + parent: 33 - uid: 29173 components: - type: Transform @@ -135353,6 +135436,31 @@ entities: - type: Transform pos: -18.5,85.5 parent: 33 + - uid: 31581 + components: + - type: Transform + pos: 60.5,17.5 + parent: 33 + - uid: 31582 + components: + - type: Transform + pos: 62.5,17.5 + parent: 33 + - uid: 31585 + components: + - type: Transform + pos: 63.5,18.5 + parent: 33 + - uid: 31586 + components: + - type: Transform + pos: 63.5,19.5 + parent: 33 + - uid: 31587 + components: + - type: Transform + pos: 63.5,20.5 + parent: 33 - proto: GrilleBroken entities: - uid: 5569 @@ -139067,7 +139175,7 @@ entities: - type: Transform pos: 5.56503,-22.863274 parent: 33 -- proto: MailPAI +- proto: MailNFPAI entities: - uid: 6330 components: @@ -148964,6 +149072,58 @@ entities: rot: 1.5707963267948966 rad pos: -61.46199,29.57894 parent: 33 +- proto: PaperCNCSheet + entities: + - uid: 8299 + components: + - type: Transform + pos: -64.418884,-35.3573 + parent: 33 + - uid: 8300 + components: + - type: Transform + pos: -65.47096,-35.513657 + parent: 33 + - uid: 8315 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -67.512634,-34.460842 + parent: 33 + - uid: 8316 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -66.50221,-34.512962 + parent: 33 + - uid: 8318 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -65.47096,-34.48169 + parent: 33 + - uid: 8319 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -64.4918,-34.544235 + parent: 33 + - uid: 25143 + components: + - type: Transform + pos: -66.512634,-35.471962 + parent: 33 + - uid: 31617 + components: + - type: Transform + pos: -67.50221,-35.451115 + parent: 33 + - uid: 31618 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -70.21878,-28.42456 + parent: 33 - proto: PartRodMetal entities: - uid: 1803 @@ -151371,9 +151531,16 @@ entities: parent: 33 - uid: 28309 components: + - type: MetaData + desc: >2- + + It doesn't look very healthy... + name: wilted potted plant - type: Transform pos: -42.5,-34.5 parent: 33 + missingComponents: + - StealTarget - proto: PowerCellHigh entities: - uid: 4644 @@ -154778,6 +154945,11 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,25.5 parent: 33 + - uid: 31601 + components: + - type: Transform + pos: 61.5,21.5 + parent: 33 - proto: PoweredSmallLight entities: - uid: 546 @@ -156531,15 +156703,15 @@ entities: - type: Transform pos: -68.5,-49.5 parent: 33 - - uid: 27026 + - uid: 27011 components: - type: Transform - pos: 54.5,19.5 + pos: 57.5,20.5 parent: 33 - - uid: 27030 + - uid: 27026 components: - type: Transform - pos: 54.5,18.5 + pos: 54.5,19.5 parent: 33 - uid: 27310 components: @@ -157587,6 +157759,23 @@ entities: - type: Transform pos: -103.5,4.5 parent: 33 +- proto: RandomIngredient + entities: + - uid: 23868 + components: + - type: Transform + pos: -8.544202,44.595825 + parent: 33 + - uid: 24769 + components: + - type: Transform + pos: -10.471286,44.606247 + parent: 33 + - uid: 25006 + components: + - type: Transform + pos: -7.440036,44.668793 + parent: 33 - proto: RandomInstruments entities: - uid: 2507 @@ -157799,6 +157988,23 @@ entities: - type: Transform pos: -25.5,117.5 parent: 33 +- proto: RandomMeat + entities: + - uid: 8301 + components: + - type: Transform + pos: -5.5172763,44.512432 + parent: 33 + - uid: 8313 + components: + - type: Transform + pos: -1.4860258,38.508263 + parent: 33 + - uid: 8314 + components: + - type: Transform + pos: -0.5276926,38.508263 + parent: 33 - proto: RandomPainting entities: - uid: 4656 @@ -160628,11 +160834,6 @@ entities: - type: Transform pos: -26.525337,35.575306 parent: 33 - - uid: 8300 - components: - - type: Transform - pos: -7.53673,44.657608 - parent: 33 - proto: ReagentContainerOliveoil entities: - uid: 6667 @@ -160645,25 +160846,6 @@ entities: - type: Transform pos: -8.569332,43.625645 parent: 33 -- proto: ReagentContainerRice - entities: - - uid: 8301 - components: - - type: Transform - pos: -10.475582,44.657608 - parent: 33 -- proto: ReagentContainerSugar - entities: - - uid: 8298 - components: - - type: Transform - pos: -8.515896,44.730576 - parent: 33 - - uid: 8299 - components: - - type: Transform - pos: -8.359646,44.647186 - parent: 33 - proto: ReagentGrinderMachineCircuitboard entities: - uid: 17159 @@ -164966,6 +165148,11 @@ entities: - type: Transform pos: -64.5,-45.5 parent: 33 + - uid: 26948 + components: + - type: Transform + pos: 58.5,20.5 + parent: 33 - uid: 26958 components: - type: Transform @@ -165226,6 +165413,36 @@ entities: - type: Transform pos: 58.5,-25.5 parent: 33 + - uid: 31588 + components: + - type: Transform + pos: 63.5,20.5 + parent: 33 + - uid: 31589 + components: + - type: Transform + pos: 63.5,19.5 + parent: 33 + - uid: 31590 + components: + - type: Transform + pos: 63.5,18.5 + parent: 33 + - uid: 31591 + components: + - type: Transform + pos: 62.5,17.5 + parent: 33 + - uid: 31592 + components: + - type: Transform + pos: 61.5,17.5 + parent: 33 + - uid: 31593 + components: + - type: Transform + pos: 60.5,17.5 + parent: 33 - proto: RemoteSignaller entities: - uid: 27714 @@ -166085,10 +166302,10 @@ entities: parent: 33 - proto: SheetGlass10 entities: - - uid: 9222 + - uid: 27030 components: - type: Transform - pos: 54.60101,18.570824 + pos: 57.601383,20.563738 parent: 33 - uid: 27346 components: @@ -166308,10 +166525,10 @@ entities: parent: 33 - proto: SheetPlastic10 entities: - - uid: 26948 + - uid: 31595 components: - type: Transform - pos: 54.517677,18.591671 + pos: 57.445133,20.532467 parent: 33 - proto: SheetRGlass entities: @@ -173101,15 +173318,15 @@ entities: - type: Transform pos: 56.5,18.5 parent: 33 - - uid: 24769 + - uid: 9222 components: - type: Transform - pos: 56.5,20.5 + pos: 54.5,18.5 parent: 33 - - uid: 25143 + - uid: 26995 components: - type: Transform - pos: 57.5,20.5 + pos: 55.5,18.5 parent: 33 - proto: SpawnMobFoxRenault entities: @@ -174361,6 +174578,13 @@ entities: - type: Transform pos: -2.5,-9.5 parent: 33 +- proto: StationAnchor + entities: + - uid: 27307 + components: + - type: Transform + pos: 61.5,20.5 + parent: 33 - proto: StationMap entities: - uid: 3765 @@ -192997,11 +193221,6 @@ entities: - type: Transform pos: 53.5,17.5 parent: 33 - - uid: 25006 - components: - - type: Transform - pos: 58.5,19.5 - parent: 33 - uid: 25144 components: - type: Transform @@ -193312,11 +193531,6 @@ entities: - type: Transform pos: 47.5,82.5 parent: 33 - - uid: 27011 - components: - - type: Transform - pos: 58.5,20.5 - parent: 33 - uid: 27043 components: - type: Transform @@ -193962,6 +194176,26 @@ entities: - type: Transform pos: 71.5,69.5 parent: 33 + - uid: 31577 + components: + - type: Transform + pos: 63.5,22.5 + parent: 33 + - uid: 31579 + components: + - type: Transform + pos: 59.5,17.5 + parent: 33 + - uid: 31583 + components: + - type: Transform + pos: 63.5,17.5 + parent: 33 + - uid: 31584 + components: + - type: Transform + pos: 63.5,21.5 + parent: 33 - proto: WallReinforcedRust entities: - uid: 31423 From 2f202995a67b11ebaaf8721fb7c51bc0c9ee18f6 Mon Sep 17 00:00:00 2001 From: FryOfDestiny <180878286+FryOfDestiny@users.noreply.github.com> Date: Sun, 29 Sep 2024 15:50:28 -0400 Subject: [PATCH 028/561] NTES_Titan evac DeviceNetwork added (#1938) Added DeviceNetwork to NTES_Titan.yml to allow for evac arrival/departure screen updates. --- Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml index 902aff3b8e4..f63608502df 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml @@ -72,6 +72,11 @@ entities: - type: Gravity gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg + - type: DeviceNetwork + configurators: [ ] + deviceLists: [ ] + transmitFrequencyId: ShuttleTimer + deviceNetId: Wireless - type: GridPathfinding - type: DecalGrid chunkCollection: From a8f33c1b2db031afa2381aa3ff9b5b069cde087e Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 29 Sep 2024 20:40:51 +0000 Subject: [PATCH 029/561] shrink tree hitboxes (#1935) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Prototypes/Entities/Objects/Decoration/flora.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 25ff782108a..3bde2042cf1 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -52,7 +52,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.35,-0.4,0.35,0.4" + bounds: "-0.15,-0.2,0.15,0.2" # DeltaV: make it smaller density: 1000 layer: - WallLayer @@ -104,7 +104,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.1,-0.3,0.1,0.3" + bounds: "-0.1,-0.2,0.1,0.2" # DeltaV: make it smaller density: 4000 layer: - WallLayer @@ -122,7 +122,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.18,-0.35,0.18,0.35" + bounds: "-0.18,-0.2,0.18,0.2" # DeltaV: make it smaller density: 2000 layer: - WallLayer @@ -140,7 +140,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.1,-0.35,0.1,0.35" + bounds: "-0.1,-0.2,0.1,0.2" # DeltaV: make it smaller density: 3500 layer: - WallLayer From 66bbbdf0e7399d38d48cafadd7ae9932f52b11af Mon Sep 17 00:00:00 2001 From: Radezolid Date: Mon, 30 Sep 2024 11:41:21 -0300 Subject: [PATCH 030/561] Fix deep fryer not being repairable once broken. (#1940) Made fryer repairable on break. --- .../Entities/Structures/Machines/deep_fryer.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml index 9749a4295d2..6b22117afae 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml @@ -145,11 +145,8 @@ collection: MetalBreak - !type:SpillBehavior solution: vat_oil - - !type:SpawnEntitiesBehavior - spawn: - MachineFrameDestroyed: - min: 1 - max: 1 + - !type:ChangeConstructionNodeBehavior + node: machineFrame - type: ApcPowerReceiver powerLoad: 300 - type: Machine From 8987f6871cce634a9d5da1021c20ca81aff13e0f Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 30 Sep 2024 16:41:41 +0200 Subject: [PATCH 031/561] 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 b21378a0daf..4e7aa173a53 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: JJ - changes: - - message: Tweaked round weighting and lowered instances of Revs - type: Tweak - id: 85 - time: '2023-10-24T00:05:22.0000000+00:00' - author: FluffiestFloof changes: - message: Fixed Felinids not being able to eat certain food. @@ -3636,3 +3630,10 @@ id: 584 time: '2024-09-27T23:42:30.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1925 +- author: Radezolid + changes: + - message: Fixed deep fryer not being repairable after being broken. + type: Fix + id: 585 + time: '2024-09-30T14:41:21.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1940 From a5ecffe694fd00372728cbab23cec2e8633543c0 Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 1 Oct 2024 00:10:53 +0200 Subject: [PATCH 032/561] add selfunremovable to headcages (#1949) fix --- .../Psionics/Items/HeadCageComponent.cs | 28 ------------------- .../Psionics/Items/HeadCagedComponent.cs | 9 ------ .../Entities/Clothing/Head/hats.yml | 5 +++- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs delete mode 100644 Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs deleted file mode 100644 index acaa832860f..00000000000 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Threading; -using Robust.Shared.Audio; - -namespace Content.Shared.Abilities.Psionics -{ - [RegisterComponent] - public sealed partial class HeadCageComponent : Component - { - public CancellationTokenSource? CancelToken; - public bool IsActive = false; - - [DataField("startBreakoutSound")] - public SoundSpecifier StartBreakoutSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_breakout_start.ogg"); - - [DataField("startUncageSound")] - public SoundSpecifier StartUncageSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_start.ogg"); - - [DataField("endUncageSound")] - public SoundSpecifier EndUncageSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_takeoff_end.ogg"); - - [DataField("startCageSound")] - public SoundSpecifier StartCageSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_start.ogg"); - - [DataField("endCageSound")] - public SoundSpecifier EndCageSound { get; set; } = new SoundPathSpecifier("/Audio/Items/Handcuffs/cuff_end.ogg"); - - } -} diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs deleted file mode 100644 index f8af46b8878..00000000000 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Content.Shared.Abilities.Psionics -{ - [RegisterComponent] - /// - /// Tracking comp so we can subscribe to alt verbs - /// - public sealed partial class HeadCagedComponent : Component - {} -} diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml index 8278114d267..8e09936d689 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hats.yml @@ -93,13 +93,16 @@ parent: ClothingHeadTinfoil id: ClothingHeadCage name: insulative headcage + suffix: SelfUnremovable description: Psionically insulates whoevers head is inside it. It takes time to resist out of. components: - type: Sprite sprite: Nyanotrasen/Clothing/Head/Hats/cage.rsi - type: Clothing + stripDelay: 10 + equipDelay: 5 sprite: Nyanotrasen/Clothing/Head/Hats/cage.rsi - - type: HeadCage + - type: SelfUnremovableClothing - type: entity parent: ClothingHeadTinfoil From 34cd8c7529a9db02b8eb4bbab84d6be2aade7927 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 1 Oct 2024 00:11:12 +0200 Subject: [PATCH 033/561] 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 4e7aa173a53..bb19ed428eb 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Fixed Felinids not being able to eat certain food. - type: Fix - id: 86 - time: '2023-10-24T00:36:33.0000000+00:00' - author: DebugOk changes: - message: Merged Wizden, hopefully fixing some bugs @@ -3637,3 +3631,10 @@ id: 585 time: '2024-09-30T14:41:21.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1940 +- author: MilonPL + changes: + - message: You can no longer take headcages off by yourself. + type: Fix + id: 586 + time: '2024-09-30T22:10:53.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1949 From 7b6e95716410f4ae28392590dc72ef212fe095ee Mon Sep 17 00:00:00 2001 From: FryOfDestiny <180878286+FryOfDestiny@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:12:47 -0400 Subject: [PATCH 034/561] Fixed Vulpkanin maskes not properly hiding the face on screen loadout. (#1946) --- .../Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index ff92b042650..81c48c49e65 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -109,3 +109,9 @@ components: - type: HumanoidAppearance species: Vulpkanin + hideLayersOnEquip: + - Snout + - HeadTop + - HeadSide + - type: Inventory + speciesId: vulpkanin From 8f71b40fbdbd8d967b6d5bf079db2972421ad39a Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 1 Oct 2024 00:13:06 +0200 Subject: [PATCH 035/561] 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 bb19ed428eb..f2019da71c8 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: Merged Wizden, hopefully fixing some bugs - type: Add - id: 87 - time: '2023-10-24T00:46:22.0000000+00:00' - author: Colin-Tel changes: - message: Fixed the Logistics department not being able to communicate on their @@ -3638,3 +3632,10 @@ id: 586 time: '2024-09-30T22:10:53.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1949 +- author: FryOfDestiny + changes: + - message: Vulpkanin display correct mask sprites in character customization screen + type: Fix + id: 587 + time: '2024-09-30T22:12:47.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1946 From 721eeba280f581a674f58031c10aed5a9e7f5a59 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Tue, 1 Oct 2024 10:52:13 -0500 Subject: [PATCH 036/561] Reduce Topical Cook Time (#1951) * Update medical_recipes.yml Signed-off-by: Stop-Signs * Comments added Signed-off-by: Stop-Signs --------- Signed-off-by: Stop-Signs --- Resources/Prototypes/Recipes/Cooking/medical_recipes.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml index 9d1947f03eb..c59659a949f 100644 --- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml @@ -2,7 +2,7 @@ id: RecipeAloeCream name: aloe cream recipe result: AloeCream - time: 10 + time: 5 # DeltaV - Changed from 10 to 5 solids: FoodAloe: 1 @@ -10,7 +10,7 @@ id: RecipeMedicatedSuture name: medicated suture recipe result: MedicatedSuture - time: 10 + time: 5 # DeltaV - Changed from 10 to 5 solids: FoodPoppy: 1 Brutepack: 1 @@ -23,7 +23,7 @@ id: RecipeRegenerativeMesh name: regenerative mesh recipe result: RegenerativeMesh - time: 10 + time: 5 # DeltaV - Changed from 10 to 5 solids: FoodAloe: 1 Ointment: 1 From 7cd0715163c45a9f4c9dad7a2bbc6f51cdd2b0c9 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:52:32 +0200 Subject: [PATCH 037/561] 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 f2019da71c8..30ebaae6335 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Fixed the Logistics department not being able to communicate on their - radio channel. - type: Fix - id: 88 - time: '2023-10-24T03:33:03.0000000+00:00' - author: DebugOk changes: - message: Merged wizden (again). Hopefully you won't visit the backrooms when using @@ -3639,3 +3632,10 @@ id: 587 time: '2024-09-30T22:12:47.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1946 +- author: Stop-Signs + changes: + - message: Reduce advanced topicals cook time + type: Tweak + id: 588 + time: '2024-10-01T15:52:13.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1951 From ef8df8d21c8113b4f18364c537018fd29f602f8b Mon Sep 17 00:00:00 2001 From: FryOfDestiny <180878286+FryOfDestiny@users.noreply.github.com> Date: Tue, 1 Oct 2024 12:52:32 -0400 Subject: [PATCH 038/561] Added DeviceNetwork to NTES_UCLB and NTES_Vertex (#1945) * Added DeviceNetwork to NTES_Titan.yml to allow for evac arrival/departure screen updates. * Added Device Network to Vertex and UCLB --- Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml | 5 +++++ Resources/Maps/Shuttles/DeltaV/NTES_Vertex.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml b/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml index d0a247d569a..35f88ce21de 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_UCLB.yml @@ -74,6 +74,11 @@ entities: - type: Gravity gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg + - type: DeviceNetwork + configurators: [ ] + deviceLists: [ ] + transmitFrequencyId: ShuttleTimer + deviceNetId: Wireless - type: DecalGrid chunkCollection: version: 2 diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Vertex.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Vertex.yml index 39f21d2695f..ad92d5abcc8 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Vertex.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Vertex.yml @@ -72,6 +72,11 @@ entities: - type: Gravity gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg + - type: DeviceNetwork + configurators: [ ] + deviceLists: [ ] + transmitFrequencyId: ShuttleTimer + deviceNetId: Wireless - type: GridPathfinding - type: DecalGrid chunkCollection: From 35480e062511ea84f3aaf5b98163c6ac57e07c80 Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 1 Oct 2024 20:48:10 +0200 Subject: [PATCH 039/561] guh --- Content.Shared/DeltaV/CCVars/DCCVars.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs index 88b516e9afc..9da683afe2c 100644 --- a/Content.Shared/DeltaV/CCVars/DCCVars.cs +++ b/Content.Shared/DeltaV/CCVars/DCCVars.cs @@ -20,7 +20,7 @@ public sealed class DCCVars /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these. /// public static readonly CVarDef NoVisionFilters = - CVarDef.Create("accessibility.no_vision_filters", false, CVar.CLIENTONLY | CVar.ARCHIVE); + CVarDef.Create("accessibility.no_vision_filters", true, CVar.CLIENTONLY | CVar.ARCHIVE); /// /// Whether the Shipyard is enabled. From bdbb101ae23de8f9573290eb7d84c653a093313c Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 1 Oct 2024 22:44:38 -0400 Subject: [PATCH 040/561] Screwthesethings --- Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml index ecf0c002a22..f11ecd9a879 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml @@ -55,7 +55,7 @@ - type: MobThresholds thresholds: 0: Alive - 300: Dead + 100: Dead - type: MeleeWeapon soundHit: path: "/Audio/Weapons/smash.ogg" @@ -90,11 +90,11 @@ - id: FoodMeatGoliath amount: 3 - id: MaterialGoliathHide1 - - type: Prying # DeltaV: let sentient goliaths pry doors - pryPowered: true - force: true - speedModifier: 1.5 - useSound: +- type: Prying # DeltaV: let sentient goliaths pry doors + - pryPowered: true + - force: true + - speedModifier: 1.5 + - useSound: path: /Audio/Items/crowbar.ogg - type: entity From ab26937426869f5d9848df0ee54a59fa94cac6b7 Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 1 Oct 2024 23:19:51 -0400 Subject: [PATCH 041/561] Fixed indent woops --- Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml index f11ecd9a879..3070f1cec62 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml @@ -90,12 +90,12 @@ - id: FoodMeatGoliath amount: 3 - id: MaterialGoliathHide1 -- type: Prying # DeltaV: let sentient goliaths pry doors - - pryPowered: true - - force: true - - speedModifier: 1.5 - - useSound: - path: /Audio/Items/crowbar.ogg + - type: Prying # DeltaV: let sentient goliaths pry doors + - pryPowered: true + - force: true + - speedModifier: 1.5 + - useSound: + path: /Audio/Items/crowbar.ogg - type: entity id: ActionGoliathTentacle From 10bede2e5b7d82655bf99d1c0de9dbf068827254 Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 1 Oct 2024 23:38:17 -0400 Subject: [PATCH 042/561] Fixed hopefully now? --- Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml index 3070f1cec62..b0f6cef07a3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml @@ -91,11 +91,11 @@ amount: 3 - id: MaterialGoliathHide1 - type: Prying # DeltaV: let sentient goliaths pry doors - - pryPowered: true - - force: true - - speedModifier: 1.5 - - useSound: - path: /Audio/Items/crowbar.ogg + - pryPowered: true + - force: true + - speedModifier: 1.5 + - useSound: + path: /Audio/Items/crowbar.ogg - type: entity id: ActionGoliathTentacle From b3d7092198e89193d73047b9caa12a4bd16aeb9c Mon Sep 17 00:00:00 2001 From: Avalon Date: Wed, 2 Oct 2024 00:03:53 -0400 Subject: [PATCH 043/561] FIXED NOW --- Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml index b0f6cef07a3..5d3840185e9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml @@ -90,11 +90,11 @@ - id: FoodMeatGoliath amount: 3 - id: MaterialGoliathHide1 - - type: Prying # DeltaV: let sentient goliaths pry doors - - pryPowered: true - - force: true - - speedModifier: 1.5 - - useSound: + - type: Prying # DeltaV: let sentient goliaths pry doors + pryPowered: true + force: true + speedModifier: 1.5 + useSound: path: /Audio/Items/crowbar.ogg - type: entity From e6c7792f8901438f0b5e3da3780cc29f8301928e Mon Sep 17 00:00:00 2001 From: AsnDen <75905158+AsnDen@users.noreply.github.com> Date: Sun, 22 Sep 2024 11:20:49 +0300 Subject: [PATCH 044/561] AI now "can" use media console (#32334) --- Content.Server/MassMedia/Systems/NewsSystem.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs index 899e9419930..3ac4ecc37bc 100644 --- a/Content.Server/MassMedia/Systems/NewsSystem.cs +++ b/Content.Server/MassMedia/Systems/NewsSystem.cs @@ -309,9 +309,6 @@ private void UpdateWriterDevices() private bool CanUse(EntityUid user, EntityUid console) { - // This shouldn't technically be possible because of BUI but don't trust client. - if (!_interaction.InRangeUnobstructed(console, user)) - return false; if (TryComp(console, out var accessReaderComponent)) { From 27f8c75ecd1ec9dfd850b454c9b96f2c6fd52fac Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 22 Sep 2024 18:21:40 +1000 Subject: [PATCH 045/561] Make buckle mint (#32370) - Fix the unbuckle mispredicts. - Fix unbuckle offset existing. - Fix interaction range not aligning with interactionoutline system. --- Content.Client/Buckle/BuckleSystem.cs | 16 ------------- .../Buckle/Components/BuckleComponent.cs | 18 ++++----------- .../Buckle/Components/StrapComponent.cs | 8 +------ .../Buckle/SharedBuckleSystem.Buckle.cs | 23 ++++++++++--------- .../Structures/Furniture/rollerbeds.yml | 1 - 5 files changed, 18 insertions(+), 48 deletions(-) diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs index 6770899e0aa..035e1300ca5 100644 --- a/Content.Client/Buckle/BuckleSystem.cs +++ b/Content.Client/Buckle/BuckleSystem.cs @@ -15,7 +15,6 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnHandleState); SubscribeLocalEvent(OnAppearanceChange); SubscribeLocalEvent(OnStrapMoveEvent); } @@ -57,21 +56,6 @@ private void OnStrapMoveEvent(EntityUid uid, StrapComponent component, ref MoveE } } - private void OnHandleState(Entity ent, ref ComponentHandleState args) - { - if (args.Current is not BuckleState state) - return; - - ent.Comp.DontCollide = state.DontCollide; - ent.Comp.BuckleTime = state.BuckleTime; - var strapUid = EnsureEntity(state.BuckledTo, ent); - - SetBuckledTo(ent, strapUid == null ? null : new (strapUid.Value, null)); - - var (uid, component) = ent; - - } - private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args) { if (!TryComp(uid, out var rotVisuals)) diff --git a/Content.Shared/Buckle/Components/BuckleComponent.cs b/Content.Shared/Buckle/Components/BuckleComponent.cs index c4810e8af08..1518ccea9ba 100644 --- a/Content.Shared/Buckle/Components/BuckleComponent.cs +++ b/Content.Shared/Buckle/Components/BuckleComponent.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Buckle.Components; /// /// This component allows an entity to be buckled to an entity with a . /// -[RegisterComponent, NetworkedComponent] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause] [Access(typeof(SharedBuckleSystem))] public sealed partial class BuckleComponent : Component { @@ -20,7 +20,7 @@ public sealed partial class BuckleComponent : Component /// across a table two tiles away" problem. /// [DataField] - public float Range = SharedInteractionSystem.InteractionRange / 1.4f; + public float Range = SharedInteractionSystem.InteractionRange; /// /// True if the entity is buckled, false otherwise. @@ -31,7 +31,7 @@ public sealed partial class BuckleComponent : Component /// /// Whether or not collisions should be possible with the entity we are strapped to /// - [DataField] + [DataField, AutoNetworkedField] public bool DontCollide; /// @@ -50,13 +50,13 @@ public sealed partial class BuckleComponent : Component /// /// The time that this entity buckled at. /// - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField, AutoNetworkedField] public TimeSpan? BuckleTime; /// /// The strap that this component is buckled to. /// - [DataField] + [DataField, AutoNetworkedField] public EntityUid? BuckledTo; /// @@ -72,14 +72,6 @@ public sealed partial class BuckleComponent : Component [ViewVariables] public int? OriginalDrawDepth; } -[Serializable, NetSerializable] -public sealed class BuckleState(NetEntity? buckledTo, bool dontCollide, TimeSpan? buckleTime) : ComponentState -{ - public readonly NetEntity? BuckledTo = buckledTo; - public readonly bool DontCollide = dontCollide; - public readonly TimeSpan? BuckleTime = buckleTime; -} - public sealed partial class UnbuckleAlertEvent : BaseAlertEvent; /// diff --git a/Content.Shared/Buckle/Components/StrapComponent.cs b/Content.Shared/Buckle/Components/StrapComponent.cs index 101c388a8bf..ad5031356e5 100644 --- a/Content.Shared/Buckle/Components/StrapComponent.cs +++ b/Content.Shared/Buckle/Components/StrapComponent.cs @@ -15,7 +15,7 @@ public sealed partial class StrapComponent : Component /// /// The entities that are currently buckled to this strap. /// - [ViewVariables] + [DataField, AutoNetworkedField] public HashSet BuckledEntities = new(); /// @@ -61,12 +61,6 @@ public sealed partial class StrapComponent : Component [DataField, AutoNetworkedField] public bool Enabled = true; - /// - /// You can specify the offset the entity will have after unbuckling. - /// - [DataField] - public Vector2 UnbuckleOffset = Vector2.Zero; - /// /// The sound to be played when a mob is buckled /// diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs index 8b35f677f18..1745730647d 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs @@ -58,13 +58,6 @@ private void InitializeBuckle() { BuckleDoafterEarly((uid, comp), ev.Event, ev); }); - - SubscribeLocalEvent(OnGetState); - } - - private void OnGetState(Entity ent, ref ComponentGetState args) - { - args.State = new BuckleState(GetNetEntity(ent.Comp.BuckledTo), ent.Comp.DontCollide, ent.Comp.BuckleTime); } private void OnBuckleComponentShutdown(Entity ent, ref ComponentShutdown args) @@ -196,11 +189,15 @@ public bool IsBuckled(EntityUid uid, BuckleComponent? component = null) protected void SetBuckledTo(Entity buckle, Entity? strap) { if (TryComp(buckle.Comp.BuckledTo, out StrapComponent? old)) + { old.BuckledEntities.Remove(buckle); + Dirty(buckle.Comp.BuckledTo.Value, old); + } if (strap is {} strapEnt && Resolve(strapEnt.Owner, ref strapEnt.Comp)) { strapEnt.Comp.BuckledEntities.Add(buckle); + Dirty(strapEnt); _alerts.ShowAlert(buckle, strapEnt.Comp.BuckledAlertType); } else @@ -463,13 +460,17 @@ private void Unbuckle(Entity buckle, Entity str if (buckleXform.ParentUid == strap.Owner && !Terminating(buckleXform.ParentUid)) { - _container.AttachParentToContainerOrGrid((buckle, buckleXform)); + _transform.PlaceNextTo((buckle, buckleXform), (strap.Owner, oldBuckledXform)); + buckleXform.ActivelyLerping = false; var oldBuckledToWorldRot = _transform.GetWorldRotation(strap); - _transform.SetWorldRotation(buckleXform, oldBuckledToWorldRot); + _transform.SetWorldRotationNoLerp((buckle, buckleXform), oldBuckledToWorldRot); - if (strap.Comp.UnbuckleOffset != Vector2.Zero) - buckleXform.Coordinates = oldBuckledXform.Coordinates.Offset(strap.Comp.UnbuckleOffset); + // TODO: This is doing 4 moveevents this is why I left the warning in, if you're going to remove it make it only do 1 moveevent. + if (strap.Comp.BuckleOffset != Vector2.Zero) + { + buckleXform.Coordinates = oldBuckledXform.Coordinates.Offset(strap.Comp.BuckleOffset); + } } _rotationVisuals.ResetHorizontalAngle(buckle.Owner); diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index 965c8261cce..9f3fbd7c455 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -54,7 +54,6 @@ position: Down rotation: -90 buckleOffset: "0,0.15" - unbuckleOffset: "0,0.15" buckleOnInteractHand: False - type: Appearance - type: GenericVisualizer From 3562d7bf6770d30de625763dd1592e1404a2a33d Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 22 Sep 2024 08:22:48 +0000 Subject: [PATCH 046/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 33 ++++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2c55f6b5721..891be34e64f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,20 +1,4 @@ Entries: -- author: TheShuEd - changes: - - message: Added diamonds ore! - type: Add - - message: Diamonds can now be sold at a bargain price. - type: Add - id: 6915 - time: '2024-07-13T12:15:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25750 -- author: coffeeware - changes: - - message: Lizards will no longer lose their snouts when equipping head bandanas - type: Fix - id: 6916 - time: '2024-07-14T02:59:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29979 - author: SlamBamActionman changes: - message: RGBee and Rainbow Carp plushies now cycle color when held/worn. @@ -3890,3 +3874,20 @@ id: 7414 time: '2024-09-21T23:21:52.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32232 +- author: AsnDen + changes: + - message: Now AI is able to use news manager console that is far away from its + core. + type: Fix + id: 7415 + time: '2024-09-22T08:20:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32334 +- author: metalgearsloth + changes: + - message: Fix unbuckling mispredicting. + type: Fix + - message: Aligned buckle range with interaction range. + type: Tweak + id: 7416 + time: '2024-09-22T08:21:41.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32370 From 185e940539b7f492ebe03c31871eb1a54cf99994 Mon Sep 17 00:00:00 2001 From: ravage <142820619+ravage123321@users.noreply.github.com> Date: Sun, 22 Sep 2024 13:33:08 +0300 Subject: [PATCH 047/561] Adding a holy watermelon helmet (#32272) * lolkekhatholy alalalla * animationcreate blelebleblbeleb --- .../Entities/Clothing/Head/hats.yml | 15 +++++ .../Objects/Consumable/Food/produce.yml | 4 ++ .../Hats/holyhatmelon.rsi/equipped-HELMET.png | Bin 0 -> 593 bytes .../Head/Hats/holyhatmelon.rsi/icon.png | Bin 0 -> 334 bytes .../Hats/holyhatmelon.rsi/inhand-left.png | Bin 0 -> 491 bytes .../Hats/holyhatmelon.rsi/inhand-right.png | Bin 0 -> 502 bytes .../Head/Hats/holyhatmelon.rsi/meta.json | 52 ++++++++++++++++++ 7 files changed, 71 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 0e9911c1b9c..524325df292 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -783,6 +783,21 @@ coefficients: Blunt: 0.95 +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHolyWatermelon + name: watermelon halo + description: Holy moly. + components: + - type: Sprite + sprite: Clothing/Head/Hats/holyhatmelon.rsi + - type: Clothing + sprite: Clothing/Head/Hats/holyhatmelon.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.95 + - type: entity parent: [ClothingHeadBase, BaseSyndicateContraband] id: ClothingHeadHatSyndie diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 69a7de8963b..e4c9341d120 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2088,6 +2088,10 @@ - type: SliceableFood count: 5 slice: FoodHolymelonSlice + - type: Butcherable + butcheringType: Knife + spawned: + - id: ClothingHeadHatHolyWatermelon - type: Tag tags: - Fruit diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..bfd047d7cf604c487a4ef9231659042d2f84e4ba GIT binary patch literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>VB+?4aSW-L z^Y-q>tl&Tywh#4P&8N>M>`oEX5pn6Mo;K-jdcm7Z3%f0Tu<%_{b)Me0uZdq^SBVCn zsVkSP$n=I4&hH;xxxFxRr9iv1U(ueE@6F{n;(uCPcv-Vul-F2>@A1vapI@C%m2_R+ zQ519RaG7BIKD*qnzyB^h@Bh~EuKW|dgyO$TetmqYQD;|mw=3Q}U0VG2)n{Rmt}fX( zKL>x0|IPG7@4@Zk{1@-u?EUs*$u3*%dHZ`VK0LT*@&E2WSN>k#$FP%o$1C2b<>`Xi z$E&aY-TZ=AY0>^KKUe-Ee^We-xJ9|9$nhYh^a?_C@{zx$B?fJEkK2DNoM%-~I3No8k19 ziI+`&vBRwgG9oH_@38OqZ>Fat_RCJMye`Z5E%Otdgj>%qD~o;S{Cx-P1;!$AgSVew z3U>c)seOm)-+KL&JM-N01qA;tg<2x`UqfNm&dHZm&@KALC^c>VtlEaQr?=TR@F&P0 luxqGon7Xtc**OhU%Xt^ncP)N#{K;;RxTmY1%Q~loCIDE46V?C# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6161c05f12086787d1e3c5c296aeceddae630eed GIT binary patch literal 334 zcmV-U0kQsxP)Px$2uVaiR9J=W(lJZJKor37e}Y4n%V1RyL1-r_RR>+VNcMb}F5;&UmkwPz3Vs5! zhb|q0gTx`h#RwvZWJs4zJqL~SK;#bGd_TD1j(6`J?;Qvsg!u0~m*6x_js5YU&;a)j z2S%PKimY?`E)M|k=Of+k7P{BTbbHq8WV+uiv_Bu|-|qfo!?ifTvRUwSd(CP%_S*C9 z)1&nm>&`lj;5on4L8y4UOL*TrH|}oLS9<3pX4x#*KfJKc>okJqarP%M>zqbVmlcq( zcNP=AX2!hLAm(M3e8t#v>cDC^_Uf`CpH2uuh1&gGL8!>56Y8@1{uj2KI?z4>ptv!A gylY`0gb^MGl&;-%-SoYfy{! zS0YA#KiMB(SRy@P+HZ!Q+~!D^|04C1H!`TmD|O$|XJk{j+hBs1*kWI(AT;&s6pPL~ z=NaHCw=Csx&}@C^?fl)kR94pi)Q!62PZ2d2&2GHE@^y#x&TfN=-`*VvI@b`lx^wMh ztvQpH&z-cqxjjE#R<(}X+mdPx$ut`KgRCt{2*)dB3VH^hV=c1wIgwiE~paUTy+gs#zKSxVLOY|8U!lfaEM!$j| z;Kilka1tVDNLz%%3UX=c-*6~my~^3Ef90Ovc;el25AXZl=?f4M5fKp)5fKq(if8-4 z7=xpOC;9puz~A*T=nb%y^YQp{=!IeUuZxOEa&gak`MDTlFqtjx)?`}dP20(Wd?azJ ziT=)|hqvTd;khb7aUhsdoTlMT8e>Ms;#L*YGFuDiH0mgwog>$aWO&R!uAqH?=P2%C zeDrIwT?jn@cx~UvtjtrV003+}T#O3%KE3q-{2FFyEpiF~i^=Sih>S|mwxJzB8w=15 zpe^$SSRaGyAk9K*d*V1NU{zN2w46PNSD}D;-YYV{2Cx9_0NPl9b^vWGKs$go7N8wK z8w=15pp6A+2hf)K=hM3W>a(89*_mdr73cb|@wApU1+;I}hHHR!fWM~3GDl11M*s^* z`-SnXXCT>ujk`6OJiadGo^0bcTzIcau2{x?>B`A_#Y(RM&Fd2ZlI`XoA4!mpWUpL7 sr%`vGZV6IX?RpPhdjt>>5fNq950ll8lzgB7&Hw-a07*qoM6N<$f`a4ZhyVZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json new file mode 100644 index 00000000000..302f4371e8c --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by ravage", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4, + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5 + ], + [ + 0.5, + 0.5, + 0.5, + 0.5 + ], + [ + 0.5, + 0.5, + 0.5, + 0.5 + ], + [ + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From d0c535bc8e877571c9ad2a76dd3a23d7fe7afa17 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 22 Sep 2024 10:34:14 +0000 Subject: [PATCH 048/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 891be34e64f..3e750ff0dbd 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: SlamBamActionman - changes: - - message: RGBee and Rainbow Carp plushies now cycle color when held/worn. - type: Fix - id: 6917 - time: '2024-07-14T10:26:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30023 - author: Winkarst-cpu changes: - message: Now grappling gun is clumsy proof. @@ -3891,3 +3884,10 @@ id: 7416 time: '2024-09-22T08:21:41.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32370 +- author: ravage123321 + changes: + - message: You can make a holy helmet from holymelons! + type: Add + id: 7417 + time: '2024-09-22T10:33:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32272 From d3c1775868bb8721c9c8a327abbd9159a19c1dba Mon Sep 17 00:00:00 2001 From: Soydium Date: Sun, 22 Sep 2024 15:26:55 +0300 Subject: [PATCH 049/561] added the ability for pigs to feed themselves (#32358) * pigs can eat * disable carcinisation --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 8be302a5e2c..f6b9122e579 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3356,7 +3356,10 @@ - type: NpcFactionMember factions: - Passive - + - type: HTN + rootTask: + task: RuminantCompound + - type: entity name: diona nymph parent: [SimpleMobBase, StripableInventoryBase] From fa8508133e151557dff07e5ed05af12c7e5fece1 Mon Sep 17 00:00:00 2001 From: saga3152 <133799418+saga3152@users.noreply.github.com> Date: Sun, 22 Sep 2024 17:15:12 +0200 Subject: [PATCH 050/561] Lemons, limes, and oranges can now be mutated into each other (#32306) --- Resources/Prototypes/Hydroponics/seeds.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 67cf804f2c2..e09074ec52e 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -210,6 +210,8 @@ - FoodLemon mutationPrototypes: - lemoon + - lime + - orange harvestRepeat: Repeat lifespan: 55 maturation: 6 @@ -262,6 +264,9 @@ packetPrototype: LimeSeeds productPrototypes: - FoodLime + mutationPrototypes: + - orange + - lemon harvestRepeat: Repeat lifespan: 55 maturation: 6 @@ -290,6 +295,8 @@ - FoodOrange mutationPrototypes: - extradimensionalOrange + - lemon + - lime harvestRepeat: Repeat lifespan: 55 maturation: 6 From da61afc85d56172196d825e4e378fcda2d82602f Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 22 Sep 2024 15:16:18 +0000 Subject: [PATCH 051/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3e750ff0dbd..dde984e4ddb 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Winkarst-cpu - changes: - - message: Now grappling gun is clumsy proof. - type: Tweak - id: 6918 - time: '2024-07-14T10:26:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29904 - author: HahayesSiH changes: - message: It is now possible to pet cyborgs. @@ -3891,3 +3884,10 @@ id: 7417 time: '2024-09-22T10:33:08.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32272 +- author: saga3152 + changes: + - message: Citrus plants can now be mutated into each other. + type: Add + id: 7418 + time: '2024-09-22T15:15:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32306 From 393dc95028cfa90a6feaee099666acb6ec0e3c27 Mon Sep 17 00:00:00 2001 From: PotentiallyTom <67602105+PotentiallyTom@users.noreply.github.com> Date: Sun, 22 Sep 2024 20:59:56 +0100 Subject: [PATCH 052/561] Makes it possible to disable the vent pressure lockout temporarily with a screwdriver (#31050) * builds * doesn't crash * seems to work * distance cap was dumb * Requested changes * can't find any issues from making the changes * Check for anchor and minor optimisation * Removed unnecessary usings * Code less verbose and cleanup --- .../Unary/Components/GasVentPumpComponent.cs | 69 ++++++++++--------- .../Unary/EntitySystems/GasVentPumpSystem.cs | 46 ++++++++++--- .../Piping/Unary/VentScrewedDoAfterEvent.cs | 9 +++ 3 files changed, 85 insertions(+), 39 deletions(-) create mode 100644 Content.Shared/Atmos/Piping/Unary/VentScrewedDoAfterEvent.cs diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs index 7d702904fbe..fcf3ddf969c 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs @@ -6,6 +6,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components { // The world if people documented their shit. + [AutoGenerateComponentPause] [RegisterComponent] public sealed partial class GasVentPumpComponent : Component { @@ -15,31 +16,25 @@ public sealed partial class GasVentPumpComponent : Component [ViewVariables] public bool IsDirty { get; set; } = false; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("inlet")] + [DataField] public string Inlet { get; set; } = "pipe"; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("outlet")] + [DataField] public string Outlet { get; set; } = "pipe"; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("pumpDirection")] + [DataField] public VentPumpDirection PumpDirection { get; set; } = VentPumpDirection.Releasing; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("pressureChecks")] + [DataField] public VentPressureBound PressureChecks { get; set; } = VentPressureBound.ExternalBound; - [ViewVariables(VVAccess.ReadOnly)] - [DataField("underPressureLockout")] + [DataField] public bool UnderPressureLockout { get; set; } = false; /// /// In releasing mode, do not pump when environment pressure is below this limit. /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("underPressureLockoutThreshold")] + [DataField] public float UnderPressureLockoutThreshold = 80; // this must be tuned in conjunction with atmos.mmos_spacing_speed /// @@ -55,12 +50,30 @@ public sealed partial class GasVentPumpComponent : Component /// repressurizing of the development map take about 30 minutes using an oxygen tank (high pressure) /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("underPressureLockoutLeaking")] + [DataField] public float UnderPressureLockoutLeaking = 0.0001f; + /// + /// Is the vent pressure lockout currently manually disabled? + /// + [DataField] + public bool IsPressureLockoutManuallyDisabled = false; + /// + /// The time when the manual pressure lockout will be reenabled. + /// + [DataField] + [AutoPausedField] + public TimeSpan ManualLockoutReenabledAt; + /// + /// How long the lockout should remain manually disabled after being interacted with. + /// + [DataField] + public TimeSpan ManualLockoutDisabledDuration = TimeSpan.FromSeconds(30); // Enough time to fill a 5x5 room + /// + /// How long the doAfter should take when attempting to manually disable the pressure lockout. + /// + public float ManualLockoutDisableDoAfter = 2.0f; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("externalPressureBound")] + [DataField] public float ExternalPressureBound { get => _externalPressureBound; @@ -72,8 +85,7 @@ public float ExternalPressureBound private float _externalPressureBound = Atmospherics.OneAtmosphere; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("internalPressureBound")] + [DataField] public float InternalPressureBound { get => _internalPressureBound; @@ -88,8 +100,7 @@ public float InternalPressureBound /// /// Max pressure of the target gas (NOT relative to source). /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("maxPressure")] + [DataField] public float MaxPressure = Atmospherics.MaxOutputPressure; /// @@ -100,8 +111,7 @@ public float InternalPressureBound /// is too high, and the vent is connected to a large pipe-net, then someone can nearly instantly flood a /// room with gas. /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("targetPressureChange")] + [DataField] public float TargetPressureChange = Atmospherics.OneAtmosphere; /// @@ -111,29 +121,26 @@ public float InternalPressureBound /// Vents cannot suck a pipe completely empty, instead pressurizing a section to a max of /// pipe pressure * PumpPower (in kPa). So a 51 kPa pipe is required for 101 kPA sections at PumpPower 2.0 /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("PumpPower")] + [DataField] public float PumpPower = 2.0f; #region Machine Linking /// /// Whether or not machine linking is enabled for this component. /// - [DataField("canLink")] + [DataField] public bool CanLink = false; - [DataField("pressurizePort", customTypeSerializer: typeof(PrototypeIdSerializer))] + [DataField(customTypeSerializer: typeof(PrototypeIdSerializer))] public string PressurizePort = "Pressurize"; - [DataField("depressurizePort", customTypeSerializer: typeof(PrototypeIdSerializer))] + [DataField(customTypeSerializer: typeof(PrototypeIdSerializer))] public string DepressurizePort = "Depressurize"; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("pressurizePressure")] + [DataField] public float PressurizePressure = Atmospherics.OneAtmosphere; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("depressurizePressure")] + [DataField] public float DepressurizePressure = 0; // When true, ignore under-pressure lockout. Used to re-fill rooms in air alarm "Fill" mode. diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index dbbbf2d0083..9d9862ff1dd 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -7,21 +7,22 @@ using Content.Server.DeviceNetwork; using Content.Server.DeviceNetwork.Components; using Content.Server.DeviceNetwork.Systems; -using Content.Server.NodeContainer; using Content.Server.NodeContainer.EntitySystems; using Content.Server.NodeContainer.Nodes; -using Content.Server.Power.Components; using Content.Shared.Atmos; using Content.Shared.Atmos.Monitor; +using Content.Shared.Atmos.Piping.Unary; using Content.Shared.Atmos.Piping.Unary.Components; using Content.Shared.Atmos.Visuals; using Content.Shared.Audio; using Content.Shared.DeviceNetwork; +using Content.Shared.DoAfter; using Content.Shared.Examine; +using Content.Shared.Interaction; using Content.Shared.Power; using Content.Shared.Tools.Systems; using JetBrains.Annotations; -using Robust.Server.GameObjects; +using Robust.Shared.Timing; namespace Content.Server.Atmos.Piping.Unary.EntitySystems { @@ -35,7 +36,9 @@ public sealed class GasVentPumpSystem : EntitySystem [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly WeldableSystem _weldable = default!; - + [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly IGameTiming _timing = default!; public override void Initialize() { base.Initialize(); @@ -51,6 +54,8 @@ public override void Initialize() SubscribeLocalEvent(OnSignalReceived); SubscribeLocalEvent(OnAnalyzed); SubscribeLocalEvent(OnWeldChanged); + SubscribeLocalEvent(OnInteractUsing); + SubscribeLocalEvent(OnVentScrewed); } private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref AtmosDeviceUpdateEvent args) @@ -80,11 +85,16 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref { return; } + // If the lockout has expired, disable it. + if (vent.IsPressureLockoutManuallyDisabled && _timing.CurTime >= vent.ManualLockoutReenabledAt) + { + vent.IsPressureLockoutManuallyDisabled = false; + } var timeDelta = args.dt; var pressureDelta = timeDelta * vent.TargetPressureChange; - var lockout = (environment.Pressure < vent.UnderPressureLockoutThreshold); + var lockout = (environment.Pressure < vent.UnderPressureLockoutThreshold) && !vent.IsPressureLockoutManuallyDisabled; if (vent.UnderPressureLockout != lockout) // update visuals only if this changes { vent.UnderPressureLockout = lockout; @@ -115,7 +125,7 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref var transferMoles = pressureDelta * environment.Volume / (pipe.Air.Temperature * Atmospherics.R); // Only run if the device is under lockout and not being overriden - if (vent.UnderPressureLockout & !vent.PressureLockoutOverride) + if (vent.UnderPressureLockout & !vent.PressureLockoutOverride & !vent.IsPressureLockoutManuallyDisabled) { // Leak only a small amount of gas as a proportion of supply pipe pressure. var pipeDelta = pipe.Air.Pressure - environment.Pressure; @@ -273,7 +283,7 @@ private void UpdateState(EntityUid uid, GasVentPumpComponent vent, AppearanceCom } else if (vent.PumpDirection == VentPumpDirection.Releasing) { - if (vent.UnderPressureLockout & !vent.PressureLockoutOverride) + if (vent.UnderPressureLockout & !vent.PressureLockoutOverride & !vent.IsPressureLockoutManuallyDisabled) _appearance.SetData(uid, VentPumpVisuals.State, VentPumpState.Lockout, appearance); else _appearance.SetData(uid, VentPumpVisuals.State, VentPumpState.Out, appearance); @@ -290,7 +300,7 @@ private void OnExamine(EntityUid uid, GasVentPumpComponent component, ExaminedEv return; if (args.IsInDetailsRange) { - if (pumpComponent.PumpDirection == VentPumpDirection.Releasing & pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride) + if (pumpComponent.PumpDirection == VentPumpDirection.Releasing & pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride & !pumpComponent.IsPressureLockoutManuallyDisabled) { args.PushMarkup(Loc.GetString("gas-vent-pump-uvlo")); } @@ -325,5 +335,25 @@ private void OnWeldChanged(EntityUid uid, GasVentPumpComponent component, ref We { UpdateState(uid, component); } + private void OnInteractUsing(EntityUid uid, GasVentPumpComponent component, InteractUsingEvent args) + { + if (args.Handled + || component.UnderPressureLockout == false + || !_toolSystem.HasQuality(args.Used, "Screwing") + || !Transform(uid).Anchored + ) + { + return; + } + + args.Handled = true; + + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.ManualLockoutDisableDoAfter, new VentScrewedDoAfterEvent(), uid, uid, args.Used)); + } + private void OnVentScrewed(EntityUid uid, GasVentPumpComponent component, VentScrewedDoAfterEvent args) + { + component.ManualLockoutReenabledAt = _timing.CurTime + component.ManualLockoutDisabledDuration; + component.IsPressureLockoutManuallyDisabled = true; + } } } diff --git a/Content.Shared/Atmos/Piping/Unary/VentScrewedDoAfterEvent.cs b/Content.Shared/Atmos/Piping/Unary/VentScrewedDoAfterEvent.cs new file mode 100644 index 00000000000..1fdc69bcf68 --- /dev/null +++ b/Content.Shared/Atmos/Piping/Unary/VentScrewedDoAfterEvent.cs @@ -0,0 +1,9 @@ +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.Atmos.Piping.Unary; + +[Serializable, NetSerializable] +public sealed partial class VentScrewedDoAfterEvent : SimpleDoAfterEvent +{ +} From 7aa93a4c96358a70d6680463efc9014c537118eb Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 22 Sep 2024 20:01:02 +0000 Subject: [PATCH 053/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dde984e4ddb..dc949249dec 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: HahayesSiH - changes: - - message: It is now possible to pet cyborgs. - type: Add - - message: Clicking on cyborgs and opening the strip menu no longer unlocks them. - type: Tweak - id: 6919 - time: '2024-07-14T14:09:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30037 - author: deltanedas changes: - message: Fixed ninja shoes not working as magboots. @@ -3891,3 +3882,10 @@ id: 7418 time: '2024-09-22T15:15:12.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32306 +- author: PotentiallyTom + changes: + - message: Vent pressure lockout can be temporarily disabled with a screwdriver + type: Tweak + id: 7419 + time: '2024-09-22T19:59:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31050 From ef7ae0b589f0e41676d6a9e5fec719d7b9dd5fb1 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Sun, 22 Sep 2024 20:27:48 -0400 Subject: [PATCH 054/561] Add the Syndicate Instigator Shuttle (#32083) * Instigator * sustenance --- .../Maps/Shuttles/ShuttleEvent/instigator.yml | 4052 +++++++++++++++++ .../Prototypes/GameRules/unknown_shuttles.yml | 11 + .../Shuttles/shuttle_incoming_event.yml | 5 + 3 files changed, 4068 insertions(+) create mode 100644 Resources/Maps/Shuttles/ShuttleEvent/instigator.yml diff --git a/Resources/Maps/Shuttles/ShuttleEvent/instigator.yml b/Resources/Maps/Shuttles/ShuttleEvent/instigator.yml new file mode 100644 index 00000000000..9c7aec2fa14 --- /dev/null +++ b/Resources/Maps/Shuttles/ShuttleEvent/instigator.yml @@ -0,0 +1,4052 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 86: FloorShuttleBlack + 91: FloorShuttleRed + 112: FloorTechMaint2 + 113: FloorTechMaint3 + 128: Lattice + 129: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: GX-Instigator + - type: Transform + pos: -0.5,-0.45833334 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: WwAAAAADWwAAAAABWwAAAAABgQAAAAAAgQAAAAAAWwAAAAADVgAAAAAAcAAAAAAAcQAAAAADcQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAADWwAAAAACVgAAAAADgQAAAAAAgQAAAAAAVgAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAAAWwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAVgAAAAAAWwAAAAAAgQAAAAAAVgAAAAAAVgAAAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAVgAAAAABVgAAAAAAVgAAAAACVgAAAAAAVgAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAABgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAVgAAAAACVgAAAAADVgAAAAACVgAAAAACcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAVgAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAVgAAAAACVgAAAAABVgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAVgAAAAACVgAAAAABVgAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAAAVgAAAAACVgAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAABVgAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAACVgAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAVgAAAAAAVgAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAABVgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAADVgAAAAADVgAAAAABVgAAAAACVgAAAAACVgAAAAABVgAAAAADgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAABWwAAAAABVgAAAAAAVgAAAAADVgAAAAAAVgAAAAAAgQAAAAAAcQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAcQAAAAABcQAAAAAAcAAAAAAAVgAAAAACWwAAAAACgQAAAAAAgQAAAAAAWwAAAAAAWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAVgAAAAAAgQAAAAAAgQAAAAAAVgAAAAAAWwAAAAABWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAVgAAAAAAVgAAAAABgQAAAAAAWwAAAAAAVgAAAAADgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAAAVgAAAAADVgAAAAADVgAAAAACVgAAAAACgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAVgAAAAABVgAAAAAAVgAAAAAAVgAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAVgAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAAAVgAAAAACVgAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAADVgAAAAABVgAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAABVgAAAAABVgAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAVgAAAAAAVgAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAABVgAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAVgAAAAAAVgAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAVgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAVgAAAAAAVgAAAAAAVgAAAAACVgAAAAACVgAAAAADVgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAcQAAAAABgQAAAAAAVgAAAAAAVgAAAAACVgAAAAAAVgAAAAACWwAAAAACWwAAAAAC + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#571212FF' + id: BrickTileWhiteInnerNe + decals: + 152: -1,3 + - node: + color: '#571212FF' + id: BrickTileWhiteInnerNw + decals: + 151: -1,3 + - node: + color: '#571212FF' + id: MiniTileBoxOverlay + decals: + 31: -7,2 + 32: 7,2 + - node: + color: '#571212FF' + id: MiniTileCheckerAOverlay + decals: + 22: -6,0 + 23: -6,1 + 24: -6,2 + 25: -6,3 + 26: -6,-1 + 27: -6,-2 + 28: -7,3 + 29: -8,3 + 30: -9,3 + 33: -9,2 + 34: -9,4 + 49: -10,2 + 50: -10,3 + 51: -10,4 + 109: -8,4 + 110: -7,4 + - node: + color: '#571212FF' + id: MiniTileCheckerBOverlay + decals: + 35: 6,-2 + 36: 6,-1 + 37: 6,0 + 38: 6,1 + 39: 6,2 + 40: 6,3 + 41: 7,3 + 42: 8,3 + 43: 9,3 + 44: 9,2 + 45: 9,4 + 46: 10,2 + 47: 10,3 + 48: 10,4 + 111: 8,4 + 112: 7,4 + - node: + color: '#571212FF' + id: MiniTileWhiteBox + decals: + 56: 0,3 + - node: + color: '#16212EFF' + id: MiniTileWhiteCornerNe + decals: + 18: -1,-1 + 77: 1,1 + - node: + color: '#571212FF' + id: MiniTileWhiteCornerNe + decals: + 10: 1,4 + 11: 2,3 + 53: 2,2 + 88: -3,-1 + 89: 5,-1 + - node: + color: '#16212EFF' + id: MiniTileWhiteCornerNw + decals: + 5: -1,1 + 19: 1,-1 + - node: + color: '#571212FF' + id: MiniTileWhiteCornerNw + decals: + 8: -2,3 + 9: -1,4 + 52: -2,2 + 87: -5,-1 + 90: 3,-1 + - node: + color: '#16212EFF' + id: MiniTileWhiteCornerSe + decals: + 76: 1,0 + - node: + color: '#571212FF' + id: MiniTileWhiteCornerSe + decals: + 80: 5,0 + - node: + color: '#16212EFF' + id: MiniTileWhiteCornerSw + decals: + 6: -1,0 + - node: + color: '#571212FF' + id: MiniTileWhiteCornerSw + decals: + 79: -5,0 + - node: + color: '#571212FF' + id: MiniTileWhiteInnerNe + decals: + 54: 1,3 + 58: -2,-1 + 72: 0,0 + 73: -1,0 + - node: + color: '#571212FF' + id: MiniTileWhiteInnerNw + decals: + 55: 1,3 + 59: 2,-1 + 74: 0,0 + 75: 1,0 + - node: + color: '#571212FF' + id: MiniTileWhiteInnerSe + decals: + 62: -2,-1 + 65: -2,2 + 69: -1,1 + 70: 0,1 + 71: 0,0 + - node: + color: '#571212FF' + id: MiniTileWhiteInnerSw + decals: + 63: 2,-1 + 64: 2,2 + 66: 0,1 + 67: 1,1 + 68: 0,0 + - node: + color: '#16212EFF' + id: MiniTileWhiteLineE + decals: + 0: 0,-1 + 2: -2,0 + 21: -2,1 + - node: + color: '#571212FF' + id: MiniTileWhiteLineE + decals: + 14: 2,1 + 15: 2,0 + 60: 2,-1 + 108: 5,-2 + - node: + color: '#16212EFF' + id: MiniTileWhiteLineN + decals: + 78: 0,1 + 147: 8,11 + 148: 9,11 + - node: + color: '#571212FF' + id: MiniTileWhiteLineN + decals: + 12: 0,4 + 57: 0,2 + 91: 4,-1 + 92: -4,-1 + 114: 9,5 + 115: -9,5 + - node: + color: '#FF9821FF' + id: MiniTileWhiteLineN + decals: + 149: -9,11 + 150: -8,11 + - node: + color: '#16212EFF' + id: MiniTileWhiteLineS + decals: + 4: 0,2 + 145: 8,11 + 146: 9,11 + 153: -1,2 + 154: 1,2 + - node: + color: '#571212FF' + id: MiniTileWhiteLineS + decals: + 16: 1,-1 + 17: -1,-1 + 113: 9,5 + 116: -9,5 + - node: + color: '#FF9821FF' + id: MiniTileWhiteLineS + decals: + 143: -9,11 + 144: -8,11 + - node: + color: '#16212EFF' + id: MiniTileWhiteLineW + decals: + 1: 0,-1 + 3: 2,0 + 20: 2,1 + - node: + color: '#571212FF' + id: MiniTileWhiteLineW + decals: + 7: -2,0 + 13: -2,1 + 61: -2,-1 + 107: -5,-2 + - node: + color: '#571212FF' + id: OffsetCheckerAOverlay + decals: + 117: 8,6 + 118: 9,6 + 119: 10,6 + 120: 10,7 + 121: 9,7 + 122: 8,7 + 123: 8,8 + 124: 9,8 + 125: 10,8 + 126: 9,9 + 127: 8,9 + 128: 8,10 + 129: 9,10 + - node: + color: '#571212FF' + id: OffsetCheckerBOverlay + decals: + 81: 5,-1 + 82: 4,-1 + 83: 3,-1 + 84: -3,-1 + 85: -4,-1 + 86: -5,-1 + 93: 2,-2 + 94: 1,-2 + 95: -1,-2 + 96: -2,-2 + 97: 0,-2 + 98: -1,-3 + 99: 1,-3 + 100: 0,-3 + 101: 5,-2 + 102: 4,-2 + 103: 3,-2 + 104: -3,-2 + 105: -4,-2 + 106: -5,-2 + 130: -8,6 + 131: -9,6 + 132: -10,6 + 133: -10,7 + 134: -9,7 + 135: -8,7 + 136: -8,8 + 137: -9,8 + 138: -10,8 + 139: -9,9 + 140: -8,9 + 141: -8,10 + 142: -9,10 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 30711 + 0,-1: + 0: 65340 + -1,0: + 0: 56828 + 0,1: + 0: 3 + -1,1: + 0: 8 + 1,0: + 0: 56670 + 1,-1: + 0: 30464 + 1: 129 + 1,1: + 1: 16386 + 0: 1032 + 2,0: + 0: 14867 + 1: 8 + 2,1: + 0: 30507 + 2,2: + 0: 13111 + 1: 128 + 1,2: + 1: 32768 + 1,3: + 1: 8 + 2,-1: + 0: 4096 + 1: 16896 + 2,3: + 1: 4612 + -1,-1: + 0: 65414 + 1: 1 + -3,0: + 1: 2 + 0: 35336 + -3,1: + 0: 52362 + -3,2: + 1: 32 + 0: 34956 + -3,-1: + 1: 18432 + -3,3: + 1: 2052 + -2,0: + 0: 30303 + -2,1: + 0: 5379 + 1: 16392 + -2,2: + 0: 4369 + 1: 8192 + -2,-1: + 0: 56320 + 1: 32 + -2,3: + 1: 4098 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: ActionToggleInternals + entities: + - uid: 495 + components: + - type: Transform + parent: 493 + - type: InstantAction + container: 493 +- proto: ActionToggleJetpack + entities: + - uid: 494 + components: + - type: Transform + parent: 493 + - type: InstantAction + container: 493 +- proto: AirCanister + entities: + - uid: 441 + components: + - type: Transform + anchored: True + pos: -8.5,11.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: AirlockExternalGlass + entities: + - uid: 125 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,1.5 + parent: 1 + - type: DeviceLinkSink + ports: + - DoorBolt + - Open + - Close + - Toggle + - type: DeviceLinkSource + linkedPorts: + 127: + - DoorStatus: DoorBolt + - uid: 126 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,1.5 + parent: 1 + - type: DeviceLinkSink + ports: + - DoorBolt + - Open + - Close + - Toggle + - type: DeviceLinkSource + linkedPorts: + 128: + - DoorStatus: DoorBolt + - uid: 127 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + - type: DeviceLinkSink + ports: + - DoorBolt + - Open + - Close + - Toggle + - type: DeviceLinkSource + linkedPorts: + 125: + - DoorStatus: DoorBolt + - uid: 128 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 + - type: DeviceLinkSink + ports: + - DoorBolt + - Open + - Close + - Toggle + - type: DeviceLinkSource + linkedPorts: + 126: + - DoorStatus: DoorBolt +- proto: AirlockMaint + entities: + - uid: 43 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,0.5 + parent: 1 + - uid: 85 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,0.5 + parent: 1 +- proto: AirlockShuttleSyndicate + entities: + - uid: 44 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,2.5 + parent: 1 + - uid: 46 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,4.5 + parent: 1 + - uid: 105 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,4.5 + parent: 1 + - uid: 107 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,2.5 + parent: 1 +- proto: AirlockSyndicate + entities: + - uid: 519 + components: + - type: Transform + pos: 9.5,5.5 + parent: 1 + - uid: 520 + components: + - type: Transform + pos: -8.5,5.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 244 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 87 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,2.5 + parent: 1 + - uid: 340 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,2.5 + parent: 1 + - uid: 341 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,4.5 + parent: 1 + - uid: 342 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,2.5 + parent: 1 + - uid: 533 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,4.5 + parent: 1 +- proto: Bed + entities: + - uid: 446 + components: + - type: Transform + pos: 10.5,7.5 + parent: 1 +- proto: BedsheetSyndie + entities: + - uid: 470 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,7.5 + parent: 1 +- proto: BlastDoor + entities: + - uid: 208 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,2.5 + parent: 1 + - uid: 209 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,3.5 + parent: 1 + - uid: 210 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,4.5 + parent: 1 + - uid: 211 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,2.5 + parent: 1 + - uid: 212 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,3.5 + parent: 1 + - uid: 213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,4.5 + parent: 1 +- proto: BoxCardboard + entities: + - uid: 531 + components: + - type: MetaData + desc: a box full of frag grenade cartridges + name: frag grenade box + - type: Transform + pos: -0.7699833,1.7199572 + parent: 1 + - type: Storage + storedItems: + 523: + position: 0,0 + _rotation: South + 522: + position: 1,0 + _rotation: South + 525: + position: 2,0 + _rotation: South + 524: + position: 0,2 + _rotation: East + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 523 + - 522 + - 525 + - 524 + - uid: 532 + components: + - type: MetaData + desc: a box full of EMP cartridges + name: EMP grenade box + - type: Transform + pos: -0.23873329,1.699124 + parent: 1 + - type: Storage + storedItems: + 159: + position: 0,0 + _rotation: South + 131: + position: 1,0 + _rotation: South + 130: + position: 2,0 + _rotation: South + 158: + position: 0,2 + _rotation: East + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 159 + - 131 + - 130 + - 158 +- proto: BoxFolderBlack + entities: + - uid: 514 + components: + - type: Transform + parent: 511 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: BoxFolderClipboard + entities: + - uid: 518 + components: + - type: Transform + parent: 511 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: BoxFolderNuclearCodes + entities: + - uid: 526 + components: + - type: Transform + pos: 1.5254097,1.4605976 + parent: 1 +- proto: BoxFolderRed + entities: + - uid: 327 + components: + - type: Transform + pos: -0.46789998,1.480374 + parent: 1 + - uid: 513 + components: + - type: Transform + parent: 511 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 516 + components: + - type: Transform + parent: 511 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: BoxMagazinePistolCaselessRifle + entities: + - uid: 463 + components: + - type: Transform + pos: -7.332144,10.686393 + parent: 1 + - uid: 464 + components: + - type: Transform + pos: -7.311311,7.5718102 + parent: 1 +- proto: ButtonFrameExit + entities: + - uid: 326 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,2.5 + parent: 1 + - uid: 331 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,2.5 + parent: 1 +- proto: C4 + entities: + - uid: 507 + components: + - type: Transform + pos: 8.755206,8.089237 + parent: 1 + - uid: 508 + components: + - type: Transform + pos: 8.755206,7.5892377 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 184 + components: + - type: Transform + pos: 9.5,4.5 + parent: 1 + - uid: 245 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 + - uid: 246 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 247 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 248 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 249 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 250 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 251 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 252 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 253 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 254 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 255 + components: + - type: Transform + pos: 6.5,-0.5 + parent: 1 + - uid: 256 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 257 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 + - uid: 258 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 + - uid: 259 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 260 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - uid: 261 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 + - uid: 262 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - uid: 263 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 264 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 265 + components: + - type: Transform + pos: -8.5,3.5 + parent: 1 + - uid: 266 + components: + - type: Transform + pos: -6.5,0.5 + parent: 1 + - uid: 267 + components: + - type: Transform + pos: -7.5,0.5 + parent: 1 + - uid: 268 + components: + - type: Transform + pos: 6.5,0.5 + parent: 1 + - uid: 269 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 + - uid: 270 + components: + - type: Transform + pos: 8.5,0.5 + parent: 1 + - uid: 271 + components: + - type: Transform + pos: 6.5,1.5 + parent: 1 + - uid: 272 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 + - uid: 273 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - uid: 274 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - uid: 275 + components: + - type: Transform + pos: 8.5,3.5 + parent: 1 + - uid: 276 + components: + - type: Transform + pos: 9.5,3.5 + parent: 1 + - uid: 277 + components: + - type: Transform + pos: 9.5,5.5 + parent: 1 + - uid: 278 + components: + - type: Transform + pos: 9.5,6.5 + parent: 1 + - uid: 279 + components: + - type: Transform + pos: 9.5,7.5 + parent: 1 + - uid: 280 + components: + - type: Transform + pos: 9.5,8.5 + parent: 1 + - uid: 281 + components: + - type: Transform + pos: 9.5,9.5 + parent: 1 + - uid: 282 + components: + - type: Transform + pos: 9.5,10.5 + parent: 1 + - uid: 283 + components: + - type: Transform + pos: 9.5,11.5 + parent: 1 + - uid: 284 + components: + - type: Transform + pos: -8.5,4.5 + parent: 1 + - uid: 285 + components: + - type: Transform + pos: -8.5,5.5 + parent: 1 + - uid: 286 + components: + - type: Transform + pos: -8.5,6.5 + parent: 1 + - uid: 287 + components: + - type: Transform + pos: -8.5,7.5 + parent: 1 + - uid: 288 + components: + - type: Transform + pos: -8.5,8.5 + parent: 1 + - uid: 289 + components: + - type: Transform + pos: -8.5,9.5 + parent: 1 + - uid: 290 + components: + - type: Transform + pos: -8.5,10.5 + parent: 1 + - uid: 291 + components: + - type: Transform + pos: -8.5,11.5 + parent: 1 + - uid: 292 + components: + - type: Transform + pos: 8.5,9.5 + parent: 1 + - uid: 293 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 294 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 295 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - uid: 296 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 297 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 298 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 299 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 300 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 301 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 302 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 303 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - uid: 304 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 + - uid: 305 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 306 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 + - uid: 307 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 308 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 309 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 310 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 311 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 312 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 + - uid: 313 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 314 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - uid: 315 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - uid: 316 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 317 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 318 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 319 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 320 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 321 + components: + - type: Transform + pos: -7.5,9.5 + parent: 1 + - uid: 322 + components: + - type: Transform + pos: -6.5,9.5 + parent: 1 + - uid: 323 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - uid: 324 + components: + - type: Transform + pos: 7.5,9.5 + parent: 1 + - uid: 325 + components: + - type: Transform + pos: 7.5,8.5 + parent: 1 + - uid: 499 + components: + - type: Transform + pos: -7.5,14.5 + parent: 1 + - uid: 500 + components: + - type: Transform + pos: -8.5,13.5 + parent: 1 + - uid: 501 + components: + - type: Transform + pos: 8.5,13.5 + parent: 1 + - uid: 502 + components: + - type: Transform + pos: 9.5,12.5 + parent: 1 + - uid: 503 + components: + - type: Transform + pos: 9.5,13.5 + parent: 1 + - uid: 504 + components: + - type: Transform + pos: -8.5,12.5 + parent: 1 + - uid: 509 + components: + - type: Transform + pos: -7.5,13.5 + parent: 1 + - uid: 510 + components: + - type: Transform + pos: 8.5,14.5 + parent: 1 +- proto: CableHV + entities: + - uid: 214 + components: + - type: Transform + pos: -8.5,0.5 + parent: 1 + - uid: 215 + components: + - type: Transform + pos: -7.5,0.5 + parent: 1 + - uid: 216 + components: + - type: Transform + pos: -7.5,1.5 + parent: 1 + - uid: 217 + components: + - type: Transform + pos: -7.5,-0.5 + parent: 1 + - uid: 218 + components: + - type: Transform + pos: 8.5,-0.5 + parent: 1 + - uid: 219 + components: + - type: Transform + pos: 8.5,0.5 + parent: 1 + - uid: 220 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 + - uid: 221 + components: + - type: Transform + pos: 9.5,0.5 + parent: 1 +- proto: CableMV + entities: + - uid: 222 + components: + - type: Transform + pos: -6.5,0.5 + parent: 1 + - uid: 223 + components: + - type: Transform + pos: -7.5,0.5 + parent: 1 + - uid: 224 + components: + - type: Transform + pos: -7.5,-0.5 + parent: 1 + - uid: 225 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 226 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 + - uid: 227 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 + - uid: 228 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 229 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 230 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 231 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 232 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 233 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 234 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 235 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 236 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 237 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 238 + components: + - type: Transform + pos: 6.5,-0.5 + parent: 1 + - uid: 239 + components: + - type: Transform + pos: 6.5,0.5 + parent: 1 + - uid: 240 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 + - uid: 241 + components: + - type: Transform + pos: 8.5,0.5 + parent: 1 + - uid: 242 + components: + - type: Transform + pos: 8.5,-0.5 + parent: 1 + - uid: 243 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 135 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,1.5 + parent: 1 + - uid: 136 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,2.5 + parent: 1 + - uid: 137 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,1.5 + parent: 1 + - uid: 138 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,2.5 + parent: 1 + - uid: 139 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,3.5 + parent: 1 + - uid: 140 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,3.5 + parent: 1 + - uid: 442 + components: + - type: Transform + pos: -7.5,1.5 + parent: 1 + - uid: 443 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 141 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,3.5 + parent: 1 + - uid: 143 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + - uid: 145 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,3.5 + parent: 1 +- proto: ClosetLegalFilled + entities: + - uid: 511 + components: + - type: Transform + pos: 8.5,6.5 + parent: 1 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 512 + - 513 + - 514 + - 515 + - 516 + - 517 + - 518 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: ClothingBeltAssault + entities: + - uid: 475 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingHeadHatSyndie + entities: + - uid: 476 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingHeadsetAltSyndicate + entities: + - uid: 133 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 134 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 521 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingOuterCoatSyndieCap + entities: + - uid: 479 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingOuterWinterSyndie + entities: + - uid: 484 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingOuterWinterSyndieCap + entities: + - uid: 487 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingShoesBootsCowboyBlack + entities: + - uid: 474 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 477 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingShoesBootsCowboyBrown + entities: + - uid: 472 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingShoesBootsWinterSyndicate + entities: + - uid: 473 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingShoesColorBlack + entities: + - uid: 482 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingShoesHighheelBoots + entities: + - uid: 485 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpskirtLawyerRed + entities: + - uid: 515 + components: + - type: Transform + parent: 511 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpskirtSyndieFormalDress + entities: + - uid: 488 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpsuitLawyerRed + entities: + - uid: 512 + components: + - type: Transform + parent: 511 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 517 + components: + - type: Transform + parent: 511 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpsuitPyjamaSyndicateBlack + entities: + - uid: 481 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpsuitPyjamaSyndicatePink + entities: + - uid: 478 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpsuitPyjamaSyndicateRed + entities: + - uid: 483 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingUniformJumpsuitSyndieFormal + entities: + - uid: 480 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 486 + components: + - type: Transform + parent: 471 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ComputerIFFSyndicate + entities: + - uid: 154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 +- proto: ComputerPowerMonitoring + entities: + - uid: 152 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 +- proto: ComputerRadar + entities: + - uid: 147 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 +- proto: ComputerShuttleSyndie + entities: + - uid: 144 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 +- proto: ComputerSurveillanceCameraMonitor + entities: + - uid: 149 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,0.5 + parent: 1 + - uid: 153 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,3.5 + parent: 1 +- proto: CrateSyndicateSurplusBundle + entities: + - uid: 459 + components: + - type: Transform + pos: -7.5,9.5 + parent: 1 + - uid: 460 + components: + - type: Transform + pos: -7.5,8.5 + parent: 1 +- proto: CyberPen + entities: + - uid: 328 + components: + - type: Transform + pos: -0.53040004,1.4282906 + parent: 1 +- proto: EnergyDaggerBox + entities: + - uid: 496 + components: + - type: Transform + pos: 8.55729,9.557987 + parent: 1 +- proto: FaxMachineSyndie + entities: + - uid: 155 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 +- proto: GasPassiveVent + entities: + - uid: 359 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 391 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' +- proto: GasPipeBend + entities: + - uid: 349 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 352 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 354 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 355 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 380 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 381 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 389 + components: + - type: Transform + pos: 9.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 404 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 423 + components: + - type: Transform + pos: -7.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 424 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 426 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 427 + components: + - type: Transform + pos: 10.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPipeStraight + entities: + - uid: 63 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 343 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 344 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 346 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 347 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 348 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 350 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 353 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 356 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 357 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 358 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 360 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 361 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 362 + components: + - type: Transform + pos: 6.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 363 + components: + - type: Transform + pos: 6.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 364 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 365 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 366 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 367 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 368 + components: + - type: Transform + pos: 6.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 369 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 370 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 371 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 372 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 373 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 375 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 376 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 377 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 378 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 379 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 382 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 383 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 392 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 393 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 394 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 395 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 396 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 397 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 398 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 399 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 401 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 402 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 403 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 405 + components: + - type: Transform + pos: -7.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 407 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 408 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 409 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 411 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 412 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 413 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 414 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 415 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 416 + components: + - type: Transform + pos: -7.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 417 + components: + - type: Transform + pos: -7.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 418 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 420 + components: + - type: Transform + pos: -7.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 421 + components: + - type: Transform + pos: -7.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 422 + components: + - type: Transform + pos: -7.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 428 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 429 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 437 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 438 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 439 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPipeTJunction + entities: + - uid: 345 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 351 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 374 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 384 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 390 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 400 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 406 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 410 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 419 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPort + entities: + - uid: 335 + components: + - type: Transform + pos: -8.5,11.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' +- proto: GasVentPump + entities: + - uid: 385 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 386 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 387 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 388 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' +- proto: GasVentScrubber + entities: + - uid: 430 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 431 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 433 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 434 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 435 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 436 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GeneratorBasic15kW + entities: + - uid: 199 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 + - uid: 200 + components: + - type: Transform + pos: -7.5,1.5 + parent: 1 +- proto: GravityGeneratorMini + entities: + - uid: 150 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 +- proto: GrenadeEMP + entities: + - uid: 130 + components: + - type: Transform + parent: 532 + - type: Physics + canCollide: False + - uid: 131 + components: + - type: Transform + parent: 532 + - type: Physics + canCollide: False + - uid: 158 + components: + - type: Transform + parent: 532 + - type: Physics + canCollide: False + - uid: 159 + components: + - type: Transform + parent: 532 + - type: Physics + canCollide: False +- proto: GrenadeFrag + entities: + - uid: 522 + components: + - type: Transform + parent: 531 + - type: Physics + canCollide: False + - uid: 523 + components: + - type: Transform + parent: 531 + - type: Physics + canCollide: False + - uid: 524 + components: + - type: Transform + parent: 531 + - type: Physics + canCollide: False + - uid: 525 + components: + - type: Transform + parent: 531 + - type: Physics + canCollide: False +- proto: Grille + entities: + - uid: 108 + components: + - type: Transform + pos: 7.5,8.5 + parent: 1 + - uid: 156 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - uid: 157 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - uid: 160 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 + - uid: 162 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 163 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 164 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 165 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 166 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 167 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 168 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 169 + components: + - type: Transform + pos: 7.5,9.5 + parent: 1 + - uid: 170 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - uid: 171 + components: + - type: Transform + pos: -6.5,9.5 + parent: 1 +- proto: Gyroscope + entities: + - uid: 185 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 +- proto: JetpackMiniFilled + entities: + - uid: 493 + components: + - type: Transform + pos: 8.505206,10.057987 + parent: 1 + - type: GasTank + toggleActionEntity: 495 + - type: Jetpack + toggleActionEntity: 494 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 494 + - 495 +- proto: LockerSyndicate + entities: + - uid: 471 + components: + - type: Transform + pos: 10.5,8.5 + parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.147 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 134 + - 133 + - 521 + - 487 + - 488 + - 486 + - 485 + - 484 + - 483 + - 482 + - 481 + - 480 + - 479 + - 478 + - 477 + - 476 + - 475 + - 474 + - 473 + - 472 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: PhoneInstrumentSyndicate + entities: + - uid: 498 + components: + - type: Transform + pos: 8.52604,8.64132 + parent: 1 +- proto: PlastitaniumWindow + entities: + - uid: 3 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + - uid: 4 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + - uid: 5 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + - uid: 7 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,5.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,4.5 + parent: 1 + - uid: 10 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,4.5 + parent: 1 + - uid: 11 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,3.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,9.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,8.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,9.5 + parent: 1 + - uid: 98 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,8.5 + parent: 1 + - uid: 113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,4.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,3.5 + parent: 1 +- proto: PoweredlightRed + entities: + - uid: 432 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,9.5 + parent: 1 + - uid: 444 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + - uid: 445 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + - uid: 448 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,9.5 + parent: 1 + - uid: 449 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,3.5 + parent: 1 + - uid: 450 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,3.5 + parent: 1 + - uid: 451 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-1.5 + parent: 1 + - uid: 453 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-1.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 447 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,1.5 + parent: 1 + - uid: 467 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,1.5 + parent: 1 +- proto: Rack + entities: + - uid: 457 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,10.5 + parent: 1 + - uid: 458 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,7.5 + parent: 1 +- proto: ShuttleGunFriendship + entities: + - uid: 129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,3.5 + parent: 1 + - uid: 132 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,3.5 + parent: 1 +- proto: SignalButtonDirectional + entities: + - uid: 329 + components: + - type: MetaData + name: blast doors + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,2.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 208: + - Pressed: Toggle + 209: + - Pressed: Toggle + 210: + - Pressed: Toggle + - uid: 330 + components: + - type: MetaData + name: blast doors + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,2.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 211: + - Pressed: Toggle + 212: + - Pressed: Toggle + 213: + - Pressed: Toggle +- proto: SMESBasic + entities: + - uid: 198 + components: + - type: Transform + pos: -8.5,0.5 + parent: 1 + - uid: 202 + components: + - type: Transform + pos: 9.5,0.5 + parent: 1 +- proto: StairStageDark + entities: + - uid: 527 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 +- proto: SubstationBasic + entities: + - uid: 187 + components: + - type: Transform + pos: -7.5,-0.5 + parent: 1 + - uid: 201 + components: + - type: Transform + pos: 8.5,-0.5 + parent: 1 +- proto: SuitStorageSyndie + entities: + - uid: 452 + components: + - type: Transform + pos: -9.5,8.5 + parent: 1 + - uid: 454 + components: + - type: Transform + pos: -9.5,6.5 + parent: 1 + - uid: 455 + components: + - type: Transform + pos: -7.5,6.5 + parent: 1 +- proto: SurveillanceCameraRouterSecurity + entities: + - uid: 332 + components: + - type: Transform + pos: 9.5,11.5 + parent: 1 +- proto: SurveillanceCameraSecurity + entities: + - uid: 333 + components: + - type: Transform + pos: -7.5,15.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Fore-Port + - uid: 334 + components: + - type: Transform + pos: 8.5,15.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Fore-Starboard + - uid: 337 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-3.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Aft-Port + - uid: 339 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-3.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Aft-Starboard +- proto: SyndicateComputerComms + entities: + - uid: 142 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 +- proto: SyndieFlag + entities: + - uid: 468 + components: + - type: Transform + pos: -2.5,2.5 + parent: 1 + - uid: 469 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 +- proto: SyndieHandyFlag + entities: + - uid: 466 + components: + - type: Transform + pos: 8.49851,10.585687 + parent: 1 + - uid: 505 + components: + - type: Transform + pos: 8.796873,10.651737 + parent: 1 +- proto: SyndieMiniBomb + entities: + - uid: 506 + components: + - type: Transform + pos: 8.421873,7.766321 + parent: 1 +- proto: SyndieSoldierSpawner + entities: + - uid: 528 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 529 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 +- proto: SyndieSoldierTeamLeaderSpawner + entities: + - uid: 530 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: TableFancyBlack + entities: + - uid: 489 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,10.5 + parent: 1 + - uid: 490 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,9.5 + parent: 1 + - uid: 491 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,8.5 + parent: 1 + - uid: 492 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,7.5 + parent: 1 +- proto: TableReinforced + entities: + - uid: 146 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - uid: 148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: Thruster + entities: + - uid: 172 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,6.5 + parent: 1 + - uid: 175 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-3.5 + parent: 1 + - uid: 176 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-3.5 + parent: 1 + - uid: 177 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 178 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-3.5 + parent: 1 + - uid: 179 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,6.5 + parent: 1 + - uid: 180 + components: + - type: Transform + pos: -6.5,12.5 + parent: 1 + - uid: 181 + components: + - type: Transform + pos: 7.5,12.5 + parent: 1 +- proto: ToolboxSyndicateFilled + entities: + - uid: 497 + components: + - type: Transform + pos: 8.505206,9.099654 + parent: 1 +- proto: TwoWayLever + entities: + - uid: 151 + components: + - type: MetaData + name: FIRE! + - type: Transform + pos: 0.48732924,3.7624094 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 129: + - Left: On + - Left: Trigger + - Right: On + - Right: Trigger + - Middle: Off + 132: + - Left: On + - Left: Trigger + - Right: On + - Right: Trigger + - Middle: Off +- proto: VendingMachineClothing + entities: + - uid: 465 + components: + - type: Transform + pos: 10.5,6.5 + parent: 1 +- proto: VendingMachineCoffee + entities: + - uid: 535 + components: + - type: Transform + pos: 6.5,-1.5 + parent: 1 +- proto: VendingMachineSustenance + entities: + - uid: 534 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 456 + components: + - type: Transform + pos: -9.5,7.5 + parent: 1 +- proto: WallPlastitanium + entities: + - uid: 2 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,6.5 + parent: 1 + - uid: 13 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,0.5 + parent: 1 + - uid: 15 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-0.5 + parent: 1 + - uid: 17 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-1.5 + parent: 1 + - uid: 18 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-1.5 + parent: 1 + - uid: 20 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-2.5 + parent: 1 + - uid: 21 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-2.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-2.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 26 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-2.5 + parent: 1 + - uid: 27 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-2.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 32 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 33 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-3.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - uid: 35 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - uid: 36 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-1.5 + parent: 1 + - uid: 37 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-1.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-0.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,0.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,5.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,5.5 + parent: 1 + - uid: 48 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,6.5 + parent: 1 + - uid: 49 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,7.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,8.5 + parent: 1 + - uid: 52 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,9.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,10.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,11.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,12.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,13.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,14.5 + parent: 1 + - uid: 61 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,13.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,12.5 + parent: 1 + - uid: 64 + components: + - type: Transform + pos: 7.5,11.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,10.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,7.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,6.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,5.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,4.5 + parent: 1 + - uid: 73 + components: + - type: Transform + pos: 7.5,5.5 + parent: 1 + - uid: 74 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,3.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + - uid: 76 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,2.5 + parent: 1 + - uid: 77 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,3.5 + parent: 1 + - uid: 79 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,4.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,5.5 + parent: 1 + - uid: 81 + components: + - type: Transform + pos: -6.5,5.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,7.5 + parent: 1 + - uid: 83 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,10.5 + parent: 1 + - uid: 86 + components: + - type: Transform + pos: -6.5,11.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,12.5 + parent: 1 + - uid: 89 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,13.5 + parent: 1 + - uid: 90 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,14.5 + parent: 1 + - uid: 93 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,13.5 + parent: 1 + - uid: 94 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,12.5 + parent: 1 + - uid: 96 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,11.5 + parent: 1 + - uid: 97 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,10.5 + parent: 1 + - uid: 99 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,9.5 + parent: 1 + - uid: 101 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,8.5 + parent: 1 + - uid: 102 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,7.5 + parent: 1 + - uid: 103 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,6.5 + parent: 1 + - uid: 104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,5.5 + parent: 1 + - uid: 106 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,5.5 + parent: 1 + - uid: 109 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,3.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,1.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,1.5 + parent: 1 + - uid: 112 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,3.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,1.5 + parent: 1 + - uid: 117 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - uid: 118 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,2.5 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,1.5 + parent: 1 + - uid: 121 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,0.5 + parent: 1 + - uid: 122 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,0.5 + parent: 1 + - uid: 123 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - uid: 124 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + - uid: 186 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,1.5 + parent: 1 + - uid: 189 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,2.5 + parent: 1 + - uid: 191 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,1.5 + parent: 1 + - uid: 192 + components: + - type: Transform + pos: -6.5,-0.5 + parent: 1 + - uid: 193 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,1.5 + parent: 1 + - uid: 194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,2.5 + parent: 1 + - uid: 196 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,1.5 + parent: 1 + - uid: 203 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,1.5 + parent: 1 + - uid: 204 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,1.5 + parent: 1 + - uid: 205 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,5.5 + parent: 1 + - uid: 206 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,5.5 + parent: 1 + - uid: 207 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-0.5 + parent: 1 +- proto: WallPlastitaniumDiagonal + entities: + - uid: 12 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,0.5 + parent: 1 + - uid: 14 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-1.5 + parent: 1 + - uid: 19 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-2.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 + - uid: 24 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 28 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-2.5 + parent: 1 + - uid: 38 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-1.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-0.5 + parent: 1 + - uid: 42 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,0.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,9.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,12.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,14.5 + parent: 1 + - uid: 59 + components: + - type: Transform + pos: -7.5,15.5 + parent: 1 + - uid: 70 + components: + - type: Transform + pos: 5.5,4.5 + parent: 1 + - uid: 78 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,4.5 + parent: 1 + - uid: 91 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,15.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: -8.5,14.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: -9.5,12.5 + parent: 1 + - uid: 100 + components: + - type: Transform + pos: -10.5,9.5 + parent: 1 + - uid: 116 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,0.5 + parent: 1 + - uid: 120 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,0.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 174 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 + - uid: 182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,7.5 + parent: 1 + - uid: 183 + components: + - type: Transform + pos: 6.5,7.5 + parent: 1 + - uid: 188 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,2.5 + parent: 1 + - uid: 190 + components: + - type: Transform + pos: -8.5,2.5 + parent: 1 + - uid: 195 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,2.5 + parent: 1 + - uid: 197 + components: + - type: Transform + pos: 7.5,2.5 + parent: 1 + - uid: 336 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,11.5 + parent: 1 + - uid: 338 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,11.5 + parent: 1 +- proto: WeaponPistolCobra + entities: + - uid: 461 + components: + - type: Transform + pos: -7.4571443,7.4884768 + parent: 1 + - uid: 462 + components: + - type: Transform + pos: -7.4154773,10.488477 + parent: 1 +... diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index 7f86f14f11b..bc45d1ddceb 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -172,6 +172,17 @@ - type: LoadMapRule preloadedGrid: NTIncorporation +- type: entity + id: UnknownShuttleInstigator + parent: BaseUnknownShuttleRule + components: + - type: StationEvent + startAnnouncement: null #dont nark on antags + weight: 1 # lower because antags. + earliestStart: 50 # late to hopefully have enough ghosts to fill all roles quickly (3) and because antags + - type: LoadMapRule + preloadedGrid: Instigator + - type: entity id: UnknownShuttleJoe parent: BaseUnknownShuttleRule diff --git a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml index 5e1f11eef9b..a5269a73dae 100644 --- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml +++ b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml @@ -69,6 +69,11 @@ path: /Maps/Shuttles/ShuttleEvent/incorporation.yml copies: 1 +- type: preloadedGrid + id: Instigator + path: /Maps/Shuttles/ShuttleEvent/instigator.yml + copies: 1 + - type: preloadedGrid id: Joe path: /Maps/Shuttles/ShuttleEvent/joe.yml From 845a04c1d715aee6ac6a637e92462d095c074e69 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:10:22 +1000 Subject: [PATCH 055/561] Predict vending machine BUI (#32376) --- .../VendingMachineBoundUserInterface.cs | 20 +++---------- .../VendingMachines/VendingMachineSystem.cs | 10 +++++++ .../VendingMachines/VendingMachineSystem.cs | 30 +++---------------- .../SharedVendingMachineSystem.cs | 5 ++-- .../VendingMachineComponent.cs | 23 ++++---------- .../VendingMachineInterfaceState.cs | 11 ------- .../Structures/Machines/vending_machines.yml | 3 ++ 7 files changed, 30 insertions(+), 72 deletions(-) diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index f8313882a2f..28b1b25adef 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -23,29 +23,17 @@ protected override void Open() { base.Open(); - var vendingMachineSys = EntMan.System(); - - _cachedInventory = vendingMachineSys.GetAllInventory(Owner); - _menu = this.CreateWindow(); _menu.OpenCenteredLeft(); _menu.Title = EntMan.GetComponent(Owner).EntityName; - _menu.OnItemSelected += OnItemSelected; - - _menu.Populate(_cachedInventory); - - _menu.OpenCenteredLeft(); + Refresh(); } - protected override void UpdateState(BoundUserInterfaceState state) + public void Refresh() { - base.UpdateState(state); - - if (state is not VendingMachineInterfaceState newState) - return; - - _cachedInventory = newState.Inventory; + var system = EntMan.System(); + _cachedInventory = system.GetAllInventory(Owner); _menu?.Populate(_cachedInventory); } diff --git a/Content.Client/VendingMachines/VendingMachineSystem.cs b/Content.Client/VendingMachines/VendingMachineSystem.cs index 922a75d24a2..1b1dde2b67e 100644 --- a/Content.Client/VendingMachines/VendingMachineSystem.cs +++ b/Content.Client/VendingMachines/VendingMachineSystem.cs @@ -8,6 +8,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem { [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!; [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; public override void Initialize() { @@ -15,6 +16,15 @@ public override void Initialize() SubscribeLocalEvent(OnAppearanceChange); SubscribeLocalEvent(OnAnimationCompleted); + SubscribeLocalEvent(OnVendingAfterState); + } + + private void OnVendingAfterState(EntityUid uid, VendingMachineComponent component, ref AfterAutoHandleStateEvent args) + { + if (_uiSystem.TryGetOpenUi(uid, VendingMachineUiKey.Key, out var bui)) + { + bui.Refresh(); + } } private void OnAnimationCompleted(EntityUid uid, VendingMachineComponent component, AnimationCompletedEvent args) diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index a265ce2d431..38407a98c72 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -34,10 +34,8 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly AccessReaderSystem _accessReader = default!; [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedActionsSystem _action = default!; [Dependency] private readonly PricingSystem _pricing = default!; [Dependency] private readonly ThrowingSystem _throwingSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!; @@ -47,7 +45,6 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentMapInit); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnBreak); SubscribeLocalEvent(OnEmagged); @@ -59,7 +56,6 @@ public override void Initialize() Subs.BuiEvents(VendingMachineUiKey.Key, subs => { - subs.Event(OnBoundUIOpened); subs.Event(OnInventoryEjectMessage); }); @@ -70,12 +66,6 @@ public override void Initialize() SubscribeLocalEvent(OnPriceCalculation); } - private void OnComponentMapInit(EntityUid uid, VendingMachineComponent component, MapInitEvent args) - { - _action.AddAction(uid, ref component.ActionEntity, component.Action, uid); - Dirty(uid, component); - } - private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, ref PriceCalculationEvent args) { var price = 0.0; @@ -94,9 +84,9 @@ private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, re args.Price += price; } - protected override void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args) + protected override void OnMapInit(EntityUid uid, VendingMachineComponent component, MapInitEvent args) { - base.OnComponentInit(uid, component, args); + base.OnMapInit(uid, component, args); if (HasComp(uid)) { @@ -110,18 +100,6 @@ private void OnActivatableUIOpenAttempt(EntityUid uid, VendingMachineComponent c args.Cancel(); } - private void OnBoundUIOpened(EntityUid uid, VendingMachineComponent component, BoundUIOpenedEvent args) - { - UpdateVendingMachineInterfaceState(uid, component); - } - - private void UpdateVendingMachineInterfaceState(EntityUid uid, VendingMachineComponent component) - { - var state = new VendingMachineInterfaceState(GetAllInventory(uid, component)); - - _userInterfaceSystem.SetUiState(uid, VendingMachineUiKey.Key, state); - } - private void OnInventoryEjectMessage(EntityUid uid, VendingMachineComponent component, VendingMachineEjectMessage args) { if (!this.IsPowered(uid, EntityManager)) @@ -297,7 +275,7 @@ public void TryEjectVendorItem(EntityUid uid, InventoryType type, string itemId, _speakOnUIClosed.TrySetFlag((uid, speakComponent)); entry.Amount--; - UpdateVendingMachineInterfaceState(uid, vendComponent); + Dirty(uid, vendComponent); TryUpdateVisualState(uid, vendComponent); Audio.PlayPvs(vendComponent.SoundVend, uid); } @@ -493,7 +471,7 @@ public void TryRestockInventory(EntityUid uid, VendingMachineComponent? vendComp RestockInventoryFromPrototype(uid, vendComponent); - UpdateVendingMachineInterfaceState(uid, vendComponent); + Dirty(uid, vendComponent); TryUpdateVisualState(uid, vendComponent); } diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index 59f8489ac62..94562ce8d1b 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -23,11 +23,11 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentInit); + SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnAfterInteract); } - protected virtual void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args) + protected virtual void OnMapInit(EntityUid uid, VendingMachineComponent component, MapInitEvent args) { RestockInventoryFromPrototype(uid, component, component.InitialStockQuality); } @@ -46,6 +46,7 @@ public void RestockInventoryFromPrototype(EntityUid uid, AddInventoryFromPrototype(uid, packPrototype.StartingInventory, InventoryType.Regular, component, restockQuality); AddInventoryFromPrototype(uid, packPrototype.EmaggedInventory, InventoryType.Emagged, component, restockQuality); AddInventoryFromPrototype(uid, packPrototype.ContrabandInventory, InventoryType.Contraband, component, restockQuality); + Dirty(uid, component); } /// diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 23130bb8f39..a3c7949600a 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -8,7 +8,7 @@ namespace Content.Shared.VendingMachines { - [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] + [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] public sealed partial class VendingMachineComponent : Component { /// @@ -21,7 +21,7 @@ public sealed partial class VendingMachineComponent : Component /// Used by the server to determine how long the vending machine stays in the "Deny" state. /// Used by the client to determine how long the deny animation should be played. /// - [DataField("denyDelay")] + [DataField] public float DenyDelay = 2.0f; /// @@ -29,16 +29,16 @@ public sealed partial class VendingMachineComponent : Component /// The selected item is dispensed afer this delay. /// Used by the client to determine how long the deny animation should be played. /// - [DataField("ejectDelay")] + [DataField] public float EjectDelay = 1.2f; - [ViewVariables] + [DataField, AutoNetworkedField] public Dictionary Inventory = new(); - [ViewVariables] + [DataField, AutoNetworkedField] public Dictionary EmaggedInventory = new(); - [ViewVariables] + [DataField, AutoNetworkedField] public Dictionary ContrabandInventory = new(); public bool Contraband; @@ -102,17 +102,6 @@ public sealed partial class VendingMachineComponent : Component // Yoinked from: https://github.com/discordia-space/CEV-Eris/blob/35bbad6764b14e15c03a816e3e89aa1751660ba9/sound/machines/Custom_deny.ogg public SoundSpecifier SoundDeny = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg"); - /// - /// The action available to the player controlling the vending machine - /// - [DataField("action", customTypeSerializer: typeof(PrototypeIdSerializer))] - [AutoNetworkedField] - public string? Action = "ActionVendingThrow"; - - [DataField("actionEntity")] - [AutoNetworkedField] - public EntityUid? ActionEntity; - public float NonLimitedEjectForce = 7.5f; public float NonLimitedEjectRange = 5f; diff --git a/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs b/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs index 82758b17f60..27651bb1cb4 100644 --- a/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs +++ b/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs @@ -2,17 +2,6 @@ namespace Content.Shared.VendingMachines { - [NetSerializable, Serializable] - public sealed class VendingMachineInterfaceState : BoundUserInterfaceState - { - public List Inventory; - - public VendingMachineInterfaceState(List inventory) - { - Inventory = inventory; - } - } - [Serializable, NetSerializable] public sealed class VendingMachineEjectMessage : BoundUserInterfaceMessage { diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 9e0d13745e9..f027d23fa98 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -5,6 +5,9 @@ description: Just add capitalism! abstract: true components: + - type: ActionGrant + actions: + - ActionVendingThrow - type: StationAiWhitelist - type: AmbientOnPowered - type: AmbientSound From 192d1415e34de29d9ef96af44d9e4dfbee91de18 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:55:30 +1000 Subject: [PATCH 056/561] Include container ents in examine (#32267) Mainly for closets but if it's like a mouse in a bag they can see what's in the bag type deal. --- Content.Client/Verbs/VerbSystem.cs | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index f990c83d7c2..f84389195f8 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -13,6 +13,7 @@ using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Client.State; +using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Utility; @@ -28,6 +29,7 @@ public sealed class VerbSystem : SharedVerbSystem [Dependency] private readonly IStateManager _stateManager = default!; [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly SharedContainerSystem _containers = default!; /// /// When a user right clicks somewhere, how large is the box we use to get entities for the context menu? @@ -81,12 +83,11 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true // Get entities _entities.Clear(); var entitiesUnderMouse = _tree.QueryAabb(targetPos.MapId, Box2.CenteredAround(targetPos.Position, new Vector2(EntityMenuLookupSize, EntityMenuLookupSize))); + bool Predicate(EntityUid e) => e == player; // Do we have to do FoV checks? if ((visibility & MenuVisibility.NoFov) == 0) { - bool Predicate(EntityUid e) => e == player; - TryComp(player.Value, out ExaminerComponent? examiner); foreach (var ent in entitiesUnderMouse) @@ -103,6 +104,21 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true } } + // If we're in a container list all other entities in it. + if (_containers.TryGetContainingContainer(player.Value, out var container)) + { + foreach (var ent in container.ContainedEntities) + { + if (ent == player.Value || _entities.Contains(ent)) + continue; + + if ((visibility & MenuVisibility.NoFov) == 0x0 || _examine.CanExamine(player.Value, targetPos, examined: ent)) + { + _entities.Add(ent); + } + } + } + if (_entities.Count == 0) return false; From 14b1322f9ea8adceb58bb3ca2ea1acde271a1e39 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 23 Sep 2024 04:56:38 +0000 Subject: [PATCH 057/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dc949249dec..0dc09f30e7d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed ninja shoes not working as magboots. - type: Fix - id: 6920 - time: '2024-07-14T15:11:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28586 - author: lzk228 changes: - message: Scarves are eatable again. @@ -3889,3 +3882,10 @@ id: 7419 time: '2024-09-22T19:59:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31050 +- author: metalgearsloth + changes: + - message: You can examine entities inside of your own container again. + type: Fix + id: 7420 + time: '2024-09-23T04:55:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32267 From 626cac6667580b2b5c6014cf9985b61b2dbf2000 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Mon, 23 Sep 2024 01:48:58 -0500 Subject: [PATCH 058/561] L6 Fits in the Suit Storage Slot (#30525) * L6 Fits in the Suit Storage Slot * 5x4 item --- .../Entities/Objects/Weapons/Guns/LMGs/lmgs.yml | 3 +++ .../Guns/LMGs/l6.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1165 bytes .../Objects/Weapons/Guns/LMGs/l6.rsi/meta.json | 4 ++++ 3 files changed, 7 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 1a1514f48cf..a415927cc56 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -8,11 +8,14 @@ - type: Sprite - type: Item size: Huge + shape: + - 0,0,4,3 - type: Clothing sprite: Objects/Weapons/Guns/LMGs/l6.rsi quickEquip: false slots: - Back + - suitStorage - type: Wieldable unwieldOnUse: false - type: GunWieldBonus diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..66bba2db27b590f6d332b89ecafd7548cfc8e4bc GIT binary patch literal 1165 zcmV;81akX{P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1R_a9K~#8N?V3w# z)KC=1?qqcA2qL<4A?T*~32Ny;p-9^i zX%VKrHnk5yN~!$PoZ&WPl6x~rnvwg1kW6*X{Li`Po+S5N<#0G0ju^&k69@ifq0x1k zYChqgBiY*8?wTM}FOM9c70o8Z2B7~!#dF-$;BhiFbyZDHUTJ9+?NP)AVB=e})cCwy z;`;u*2ZhZ7Mt*($tN%$UG^5@B*cPKH02rK``>1Z;x>L9yT)#Hm(u77CFcXabBN1+A z_|o8DOTd@4HDjB$JX41${Zt(tSprZlm(|M3irU%PQoX%>#z8R30OnGZ!IM2b-jN5- z2TvUdI0K_Q50y&AX#PXTqa~yAqIz2G@9kxp0WdZ;)^hCUk6&tf`i7VGAfwOOWd4J3 z4G5!Fs~xA zI4mO%Y&89=LxQ8dy1K01y?<+^#X11hYSnZ8ZvDG=)a&&l zKS)vXFH?t6)<>SvrUrPF_N_)kOdMbF`cDNk$=#)}w8IMfLTSy=$;d_b?LGfIO!fgR$9cIH!lqi1yHV-^;8uj= z90LOv)y&LI|6lCkyVwx04LFbeH0n+20RV)G@Y&f9-Z=^KU2KW-6hfK%rqBCPbR5AT zx+n^l&8uk`dK~})01Nf`)U~Hd8lxlVwg?F6pO*bhrU0b*JP>9}zb!f(4u`|xa5%Dr zN6>EQ5Tns%4I;Bg;cmey0HdR$>hYr|h0OxAq0xre0Pxl&DYd!zTP-bp^8Q{#(1u1p zv&kD{Yyen$mnA7^HpAECih!;S&1jD!HUO-^1`QXL;6TahaTNbW5u{-wE2a%CkoQP0EsTvQgnU-wNB^?{#gdIxZbvjB?n#YUYhR|4RTwdla!#fTpAv)Z5cV zMKq#W8mdvm*8sY)enYaGFx4F!0QTod(d)F|pEde^0yLX!@i(sC`rPld<((DXpwZ!Q fI2;Z~QBdk1VrUzlwGgPK00000NkvXXu0mjf_T(eQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json index 8cd2e3fe7b8..4b0e50c2b39 100644 --- a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json @@ -47,6 +47,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } From 1ba2cb2f687c7554693466667cdee84396f272cc Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 23 Sep 2024 06:50:05 +0000 Subject: [PATCH 059/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0dc09f30e7d..8cc30cb5557 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Scarves are eatable again. - type: Fix - id: 6921 - time: '2024-07-14T15:12:25.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29959 - author: Winkarst-cpu changes: - message: Now addgamerule command processes only valid game rules. @@ -3889,3 +3882,12 @@ id: 7420 time: '2024-09-23T04:55:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32267 +- author: Cojoke-dot + changes: + - message: L6 Saw now fits in the suit slot + type: Tweak + - message: L6 Saw is now a 5x4 item + type: Tweak + id: 7421 + time: '2024-09-23T06:48:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30525 From b92a8edcf2065645c343a0073120e24eb6c3dc71 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:28:42 +1200 Subject: [PATCH 060/561] Entity menu lookup changes (#32395) --- Content.Client/Verbs/VerbSystem.cs | 157 ++++++++++++++--------------- Content.Shared/CCVar/CCVars.cs | 6 ++ 2 files changed, 84 insertions(+), 79 deletions(-) diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index f84389195f8..f592303d281 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -1,9 +1,9 @@ using System.Diagnostics.CodeAnalysis; -using System.Linq; using System.Numerics; using Content.Client.Examine; using Content.Client.Gameplay; using Content.Client.Popups; +using Content.Shared.CCVar; using Content.Shared.Examine; using Content.Shared.Tag; using Content.Shared.Verbs; @@ -13,6 +13,7 @@ using Robust.Client.Graphics; using Robust.Client.Player; using Robust.Client.State; +using Robust.Shared.Configuration; using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Utility; @@ -30,11 +31,10 @@ public sealed class VerbSystem : SharedVerbSystem [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly SharedContainerSystem _containers = default!; + [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly EntityLookupSystem _lookup = default!; - /// - /// When a user right clicks somewhere, how large is the box we use to get entities for the context menu? - /// - public const float EntityMenuLookupSize = 0.25f; + private float _lookupSize; /// /// These flags determine what entities the user can see on the context menu. @@ -43,128 +43,127 @@ public sealed class VerbSystem : SharedVerbSystem public Action? OnVerbsResponse; - private List _entities = new(); - public override void Initialize() { base.Initialize(); SubscribeNetworkEvent(HandleVerbResponse); + Subs.CVar(_cfg, CCVars.GameEntityMenuLookup, OnLookupChanged, true); + } + + private void OnLookupChanged(float val) + { + _lookupSize = val; } /// - /// Get all of the entities in an area for displaying on the context menu. + /// Get all of the entities in an area for displaying on the context menu. /// - public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true)] out List? result) + /// True if any entities were found. + public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true)] out List? entities) { - result = null; + entities = null; - if (_stateManager.CurrentState is not GameplayStateBase gameScreenBase) + if (_stateManager.CurrentState is not GameplayStateBase) return false; - var player = _playerManager.LocalEntity; - if (player == null) + if (_playerManager.LocalEntity is not { } player) return false; // If FOV drawing is disabled, we will modify the visibility option to ignore visiblity checks. - var visibility = _eyeManager.CurrentEye.DrawFov - ? Visibility - : Visibility | MenuVisibility.NoFov; + var visibility = _eyeManager.CurrentEye.DrawFov ? Visibility : Visibility | MenuVisibility.NoFov; - var ev = new MenuVisibilityEvent() + var ev = new MenuVisibilityEvent { TargetPos = targetPos, Visibility = visibility, }; - RaiseLocalEvent(player.Value, ref ev); + RaiseLocalEvent(player, ref ev); visibility = ev.Visibility; - // Get entities - _entities.Clear(); - var entitiesUnderMouse = _tree.QueryAabb(targetPos.MapId, Box2.CenteredAround(targetPos.Position, new Vector2(EntityMenuLookupSize, EntityMenuLookupSize))); - bool Predicate(EntityUid e) => e == player; - - // Do we have to do FoV checks? - if ((visibility & MenuVisibility.NoFov) == 0) - { - TryComp(player.Value, out ExaminerComponent? examiner); - - foreach (var ent in entitiesUnderMouse) - { - if (_examine.CanExamine(player.Value, targetPos, Predicate, ent.Uid, examiner)) - _entities.Add(ent.Uid); - } - } - else + // Initially, we include all entities returned by a sprite area lookup + var box = Box2.CenteredAround(targetPos.Position, new Vector2(_lookupSize, _lookupSize)); + var queryResult = _tree.QueryAabb(targetPos.MapId, box); + entities = new List(queryResult.Count); + foreach (var ent in queryResult) { - foreach (var ent in entitiesUnderMouse) - { - _entities.Add(ent.Uid); - } + entities.Add(ent.Uid); } // If we're in a container list all other entities in it. - if (_containers.TryGetContainingContainer(player.Value, out var container)) + // E.g., allow players in lockers to examine / interact with other entities in the same locker + if (_containers.TryGetContainingContainer((player, null), out var container)) { - foreach (var ent in container.ContainedEntities) + // Only include the container contents when clicking near it. + if (entities.Contains(container.Owner) + || _containers.TryGetOuterContainer(container.Owner, Transform(container.Owner), out var outer) + && entities.Contains(outer.Owner)) { - if (ent == player.Value || _entities.Contains(ent)) - continue; - - if ((visibility & MenuVisibility.NoFov) == 0x0 || _examine.CanExamine(player.Value, targetPos, examined: ent)) + // The container itself might be in some other container, so it might not have been added by the + // sprite tree lookup. + if (!entities.Contains(container.Owner)) + entities.Add(container.Owner); + + // TODO Context Menu + // This might miss entities in some situations. E.g., one of the contained entities entity in it, that + // itself has another entity attached to it, then we should be able to "see" that entity. + // E.g., if a security guard is on a segway and gets thrown in a locker, this wouldn't let you see the guard. + foreach (var ent in container.ContainedEntities) { - _entities.Add(ent); + if (!entities.Contains(ent)) + entities.Add(ent); } } } - if (_entities.Count == 0) - return false; - - if (visibility == MenuVisibility.All) + if ((visibility & MenuVisibility.InContainer) != 0) { - result = new (_entities); - return true; + // This is inefficient, but I'm lazy and CBF implementing my own recursive container method. Note that + // this might actually fail to add the contained children of some entities in the menu. E.g., an entity + // with a large sprite aabb, but small broadphase might appear in the menu, but have its children added + // by this. + var flags = LookupFlags.All & ~LookupFlags.Sensors; + foreach (var e in _lookup.GetEntitiesInRange(targetPos, _lookupSize, flags: flags)) + { + if (!entities.Contains(e)) + entities.Add(e); + } } - // remove any entities in containers - if ((visibility & MenuVisibility.InContainer) == 0) + // Do we have to do FoV checks? + if ((visibility & MenuVisibility.NoFov) == 0) { - for (var i = _entities.Count - 1; i >= 0; i--) + TryComp(player, out ExaminerComponent? examiner); + for (var i = entities.Count - 1; i >= 0; i--) { - var entity = _entities[i]; - - if (ContainerSystem.IsInSameOrTransparentContainer(player.Value, entity)) - continue; - - _entities.RemoveSwap(i); + if (!_examine.CanExamine(player, targetPos, e => e == player, entities[i], examiner)) + entities.RemoveSwap(i); } } - // remove any invisible entities - if ((visibility & MenuVisibility.Invisible) == 0) + if ((visibility & MenuVisibility.Invisible) != 0) + return entities.Count != 0; + + for (var i = entities.Count - 1; i >= 0; i--) { - var spriteQuery = GetEntityQuery(); + if (_tagSystem.HasTag(entities[i], "HideContextMenu")) + entities.RemoveSwap(i); + } - for (var i = _entities.Count - 1; i >= 0; i--) - { - var entity = _entities[i]; + // Unless we added entities in containers, every entity should already have a visible sprite due to + // the fact that we used the sprite tree query. + if (container == null && (visibility & MenuVisibility.InContainer) == 0) + return entities.Count != 0; - if (!spriteQuery.TryGetComponent(entity, out var spriteComponent) || - !spriteComponent.Visible || - _tagSystem.HasTag(entity, "HideContextMenu")) - { - _entities.RemoveSwap(i); - } - } + var spriteQuery = GetEntityQuery(); + for (var i = entities.Count - 1; i >= 0; i--) + { + if (!spriteQuery.TryGetComponent(entities[i], out var spriteComponent) || !spriteComponent.Visible) + entities.RemoveSwap(i); } - if (_entities.Count == 0) - return false; - - result = new(_entities); - return true; + return entities.Count != 0; } /// diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 44c6e38643c..7058c57a063 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -430,6 +430,12 @@ public static readonly CVarDef public static readonly CVarDef ContrabandExamine = CVarDef.Create("game.contraband_examine", true, CVar.SERVER | CVar.REPLICATED); + /// + /// Size of the lookup area for adding entities to the context menu + /// + public static readonly CVarDef GameEntityMenuLookup = + CVarDef.Create("game.entity_menu_lookup", 0.25f, CVar.CLIENTONLY | CVar.ARCHIVE); + /* * Discord */ From b225563ebc376e8ac68b15662b1a4b85fec12234 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 23 Sep 2024 07:29:48 +0000 Subject: [PATCH 061/561] Automatic changelog update --- Resources/Changelog/Admin.yml | 8 ++++++++ Resources/Changelog/Changelog.yml | 15 ++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 9c9673a6622..0137c7b3403 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -544,5 +544,13 @@ Entries: id: 67 time: '2024-09-15T01:55:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31654 +- author: ElectroJr + changes: + - message: The `menuvis all` once again makes all entities show up in the right-click + context menu. + type: Fix + id: 68 + time: '2024-09-23T07:28:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32395 Name: Admin Order: 3 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8cc30cb5557..629f2e6fc3f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Winkarst-cpu - changes: - - message: Now addgamerule command processes only valid game rules. - type: Fix - id: 6922 - time: '2024-07-15T19:18:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29912 - author: Jezithyr changes: - message: Removed the Geras ability from Slimes @@ -3891,3 +3884,11 @@ id: 7421 time: '2024-09-23T06:48:58.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30525 +- author: ElectroJr + changes: + - message: Entities within the same container as the player only appear in the context + menu when clicking near the container. + type: Fix + id: 7422 + time: '2024-09-23T07:28:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32395 From 5c5fea73eee7f659e03f9027a03dcec978c6eed8 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:51:48 +0200 Subject: [PATCH 062/561] Computer wirepanel (#32273) * Computer wirehacking * Power wire now shocks * deconstruction fix * updated tests * Better parenting * maintenance panel sprite * new sprite for maintenance panel open --- .../Interaction/ComputerContruction.cs | 4 +- Resources/Locale/en-US/wires/wire-names.ftl | 1 + .../Computers/base_structurecomputers.yml | 29 +++ .../Machines/Computers/computers.yml | 184 +++++++++++++----- .../Construction/Graphs/machines/computer.yml | 6 +- Resources/Prototypes/Wires/layouts.yml | 35 ++-- .../computers.rsi/generic_panel_open.png | Bin 0 -> 405 bytes .../Machines/computers.rsi/meta.json | 6 +- 8 files changed, 203 insertions(+), 62 deletions(-) create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/generic_panel_open.png diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs index 8af5edaf316..9a819b257bc 100644 --- a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs +++ b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs @@ -39,7 +39,7 @@ public async Task DeconstructComputer() await StartDeconstruction(ComputerId); // Initial interaction turns id computer into generic computer - await InteractUsing(Screw); + await InteractUsing(Pry); AssertPrototype(ComputerFrame); // Perform deconstruction steps @@ -69,7 +69,7 @@ public async Task ChangeComputer() await SpawnTarget(ComputerId); // Initial interaction turns id computer into generic computer - await InteractUsing(Screw); + await InteractUsing(Pry); AssertPrototype(ComputerFrame); // Perform partial deconstruction steps diff --git a/Resources/Locale/en-US/wires/wire-names.ftl b/Resources/Locale/en-US/wires/wire-names.ftl index 1ac2ae89123..16ae068eaaf 100644 --- a/Resources/Locale/en-US/wires/wire-names.ftl +++ b/Resources/Locale/en-US/wires/wire-names.ftl @@ -40,6 +40,7 @@ wires-board-name-fatextractor = FatExtractor wires-board-name-flatpacker = Flatpacker wires-board-name-spaceheater = Space Heater wires-board-name-jukebox = Jukebox +wires-board-name-computer = Computer # names that get displayed in the wire hacking hud & admin logs. diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml index 204e06c8600..9baca8b4b6b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml @@ -30,6 +30,8 @@ state: generic - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Appearance - type: GenericVisualizer visuals: @@ -40,6 +42,10 @@ computerLayerKeys: True: { visible: true, shader: unshaded } False: { visible: true, shader: shaded } + enum.WiresVisuals.MaintenancePanelState: + enum.WiresVisualLayers.MaintenancePanel: + True: { visible: false } + False: { visible: true } - type: LitOnPowered - type: PointLight radius: 1.5 @@ -61,3 +67,26 @@ - type: LightningTarget priority: 1 - type: RequireProjectileTarget + - type: Electrified + enabled: false + usesApcPower: true + - type: WiresPanel + - type: WiresVisuals + - type: Wires + boardName: wires-board-name-computer + layoutId: Computer +# +# This is overwritten by children, so needs to be defined there +# - type: UserInterface +# interfaces: +# enum.WiresUiKey.Key: +# type: WiresBoundUserInterface + +- type: entity + parent: BaseComputer + id: BaseComputerAiAccess + components: + - type: StationAiWhitelist + - type: Wires + boardName: wires-board-name-computer + layoutId: ComputerAi diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index a3c154ae062..fa105f6bffc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -1,10 +1,9 @@ - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerAlert name: atmospheric alerts computer description: Used to access the station's atmospheric automated alert system. components: - - type: StationAiWhitelist - type: Computer board: AlertsComputerCircuitboard - type: Sprite @@ -17,6 +16,8 @@ state: alert-0 - map: ["computerLayerKeys"] state: atmos_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: GenericVisualizer visuals: enum.ComputerVisuals.Powered: @@ -25,7 +26,7 @@ False: { visible: false } computerLayerKeys: True: { visible: true, shader: unshaded } - False: { visible: true, shader: shaded } + False: { visible: true, shader: shaded } enum.AtmosAlertsComputerVisuals.ComputerLayerScreen: computerLayerScreen: 0: { state: alert-0 } @@ -33,6 +34,10 @@ 2: { state: alert-1 } 3: { state: alert-2 } 4: { state: alert-2 } + enum.WiresVisuals.MaintenancePanelState: + enum.WiresVisualLayers.MaintenancePanel: + True: { visible: false } + False: { visible: true } - type: AtmosAlertsComputer - type: ActivatableUI singleUser: true @@ -41,6 +46,8 @@ interfaces: enum.AtmosAlertsComputerUiKey.Key: type: AtmosAlertsComputerBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: entity parent: BaseComputer @@ -58,6 +65,8 @@ interfaces: enum.EmergencyConsoleUiKey.Key: type: EmergencyConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: PointLight radius: 1.5 energy: 1.6 @@ -79,6 +88,8 @@ interfaces: enum.ShuttleConsoleUiKey.Key: type: ShuttleConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: RadarConsole - type: WorldLoader radius: 256 @@ -121,6 +132,8 @@ state: shuttle - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Computer board: ShuttleConsoleCircuitboard @@ -140,6 +153,8 @@ state: syndishuttle - map: ["computerLayerKeys"] state: syndie_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Tag tags: - Syndicate @@ -170,6 +185,8 @@ state: shuttle - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: DroneConsole components: - type: CargoShuttle @@ -185,12 +202,11 @@ stealGroup: CargoShuttleConsoleCircuitboard - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerIFF name: IFF computer description: Allows you to control the IFF characteristics of this vessel. components: - - type: StationAiWhitelist - type: IFFConsole - type: Sprite layers: @@ -203,12 +219,16 @@ state: helm - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: ActivatableUI key: enum.IFFConsoleUiKey.Key - type: UserInterface interfaces: enum.IFFConsoleUiKey.Key: type: IFFConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: ComputerIFFCircuitboard @@ -229,16 +249,17 @@ interfaces: enum.IFFConsoleUiKey.Key: type: IFFConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: ComputerIFFSyndicateCircuitboard - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerPowerMonitoring name: power monitoring computer description: It monitors power levels across the station. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -249,6 +270,8 @@ state: power_monitor - map: ["computerLayerKeys"] state: power_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: PointLight radius: 1.5 energy: 1.6 @@ -270,14 +293,15 @@ interfaces: enum.PowerMonitoringConsoleUiKey.Key: type: PowerMonitoringConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerMedicalRecords name: medical records computer description: This can be used to check medical records. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -288,6 +312,8 @@ state: medcomp - map: ["computerLayerKeys"] state: med_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: PointLight radius: 1.5 energy: 1.6 @@ -296,17 +322,18 @@ board: MedicalRecordsComputerCircuitboard - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerCriminalRecords name: criminal records computer description: This can be used to check criminal records. Only security can modify them. components: - - type: StationAiWhitelist - type: CriminalRecordsConsole - type: UserInterface interfaces: enum.CriminalRecordsConsoleKey.Key: type: CriminalRecordsConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: ActivatableUI key: enum.CriminalRecordsConsoleKey.Key - type: Sprite @@ -319,6 +346,8 @@ state: explosive - map: ["computerLayerKeys"] state: security_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: PointLight radius: 1.5 energy: 1.6 @@ -332,17 +361,18 @@ - CriminalRecords - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerStationRecords name: station records computer description: This can be used to check station records. components: - - type: StationAiWhitelist - type: GeneralStationRecordConsole - type: UserInterface interfaces: enum.GeneralStationRecordConsoleKey.Key: type: GeneralStationRecordConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: ActivatableUI key: enum.GeneralStationRecordConsoleKey.Key - type: PointLight @@ -356,12 +386,11 @@ - Forensics - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerCrewMonitoring name: crew monitoring console description: Used to monitor active health sensors built into most of the crew's uniforms. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -372,6 +401,8 @@ state: crew - map: ["computerLayerKeys"] state: med_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: PointLight radius: 1.5 energy: 1.6 @@ -384,6 +415,8 @@ interfaces: enum.CrewMonitoringUIKey.Key: type: CrewMonitoringBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: CrewMonitoringConsole - type: DeviceNetwork deviceNetId: Wireless @@ -392,12 +425,11 @@ range: 1200 - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerResearchAndDevelopment name: R&D computer description: A computer used to interface with R&D tools. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -408,6 +440,8 @@ state: rdcomp - map: ["computerLayerKeys"] state: rd_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: ResearchClient - type: ResearchConsole - type: ActiveRadio @@ -422,6 +456,8 @@ type: ResearchConsoleBoundUserInterface enum.ResearchClientUiKey.Key: type: ResearchClientBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: ApcPowerReceiver powerLoad: 1000 - type: Computer @@ -437,12 +473,11 @@ - Science - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerAnalysisConsole name: analysis console description: A computer used to interface with the artifact analyzer. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -453,6 +488,8 @@ state: artifact - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: ResearchClient - type: AnalysisConsole reportEntityId: PaperArtifactAnalyzer @@ -471,6 +508,8 @@ type: AnalysisConsoleBoundUserInterface enum.ResearchClientUiKey.Key: type: ResearchClientBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: ApcPowerReceiver powerLoad: 1000 - type: Computer @@ -484,12 +523,11 @@ - Xenoarchaeology - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerId name: ID card computer description: Terminal for programming Nanotrasen employee ID cards to access parts of the station. components: - - type: StationAiWhitelist - type: IdCardConsole privilegedIdSlot: name: id-card-console-privileged-id @@ -515,6 +553,8 @@ interfaces: enum.IdCardConsoleUiKey.Key: type: IdCardConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: CrewManifestViewer ownerKey: enum.IdCardConsoleUiKey.Key - type: Sprite @@ -527,6 +567,8 @@ state: id - map: ["computerLayerKeys"] state: id_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Computer board: IDComputerCircuitboard - type: PointLight @@ -544,12 +586,11 @@ IdCardConsole-targetId: !type:ContainerSlot - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: computerBodyScanner name: body scanner computer description: A body scanner. components: - - type: StationAiWhitelist - type: ApcPowerReceiver powerLoad: 500 - type: Computer @@ -560,12 +601,11 @@ color: "#1f8c28" - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerComms name: communications computer description: A computer used to make station wide announcements via keyboard, set the appropriate alert level, and call the emergency shuttle. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -576,6 +616,8 @@ state: comm - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: AccessReader access: [[ "Command" ]] - type: CommunicationsConsole @@ -588,6 +630,8 @@ interfaces: enum.CommunicationsConsoleUiKey.Key: type: CommunicationsConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: CommsComputerCircuitboard - type: PointLight @@ -617,6 +661,8 @@ state: comm_syndie - map: ["computerLayerKeys"] state: syndie_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: AccessReader access: [[ "NuclearOperative" ]] - type: CommunicationsConsole @@ -633,12 +679,11 @@ color: "#f71713" - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerSolarControl name: solar control computer description: A controller for solar panel arrays. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -649,6 +694,8 @@ state: solar_screen - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: SolarControlConsole - type: ActivatableUI key: enum.SolarControlConsoleUiKey.Key @@ -656,6 +703,8 @@ interfaces: enum.SolarControlConsoleUiKey.Key: type: SolarControlConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: SolarControlComputerCircuitboard - type: PointLight @@ -664,12 +713,11 @@ color: "#e6e227" - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerRadar name: mass scanner computer description: A computer for detecting nearby bodies, displaying them by position and mass. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -680,6 +728,8 @@ state: solar_screen - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: RadarConsole - type: ActivatableUI key: enum.RadarConsoleUiKey.Key @@ -687,6 +737,8 @@ interfaces: enum.RadarConsoleUiKey.Key: type: RadarConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: RadarConsoleCircuitboard - type: PointLight @@ -696,11 +748,10 @@ - type: entity id: ComputerCargoShuttle - parent: BaseComputer + parent: BaseComputerAiAccess name: cargo shuttle computer description: Used to order the shuttle. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -711,6 +762,8 @@ state: supply - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: CargoShuttleConsole - type: ActivatableUI key: enum.CargoConsoleUiKey.Shuttle @@ -718,6 +771,8 @@ interfaces: enum.CargoConsoleUiKey.Shuttle: type: CargoShuttleConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: CargoShuttleComputerCircuitboard - type: PointLight @@ -732,11 +787,10 @@ - type: entity id: ComputerCargoOrders - parent: BaseComputer + parent: BaseComputerAiAccess name: cargo request computer description: Used to order supplies and approve requests. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -747,6 +801,8 @@ state: request - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: CargoOrderConsole - type: BankClient - type: ActiveRadio @@ -758,6 +814,8 @@ interfaces: enum.CargoConsoleUiKey.Orders: type: CargoOrderConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: CargoRequestComputerCircuitboard - type: PointLight @@ -781,11 +839,10 @@ - type: entity id: ComputerCargoBounty - parent: BaseComputer + parent: BaseComputerAiAccess name: cargo bounty computer description: Used to manage currently active bounties. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -796,6 +853,8 @@ state: bounty - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: CargoBountyConsole - type: ActivatableUI key: enum.CargoConsoleUiKey.Bounty @@ -803,6 +862,8 @@ interfaces: enum.CargoConsoleUiKey.Bounty: type: CargoBountyConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: CargoBountyComputerCircuitboard - type: PointLight @@ -817,12 +878,11 @@ - Cargo - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerCloningConsole name: cloning console computer description: The centerpiece of the cloning system, medicine's greatest accomplishment. It has lots of ports and wires. components: - - type: StationAiWhitelist - type: CloningConsole - type: DeviceList - type: DeviceNetwork @@ -837,6 +897,8 @@ state: dna - map: ["computerLayerKeys"] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: ApcPowerReceiver powerLoad: 3100 #We want this to fail first so I transferred most of the scanner and pod's power here. (3500 in total) - type: Computer @@ -856,6 +918,8 @@ interfaces: enum.CloningConsoleUiKey.Key: type: CloningConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Speech speechVerb: Robotic speechSounds: Pai @@ -868,11 +932,10 @@ - type: entity id: ComputerSalvageExpedition - parent: BaseComputer + parent: BaseComputerAiAccess name: salvage expeditions computer description: Used to accept salvage missions, if you're tough enough. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -883,6 +946,8 @@ state: mining - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Appearance - type: GenericVisualizer visuals: @@ -893,6 +958,10 @@ computerLayerKeys: True: { visible: true, shader: unshaded } False: { visible: true } + enum.WiresVisuals.MaintenancePanelState: + enum.WiresVisualLayers.MaintenancePanel: + True: { visible: false } + False: { visible: true } - type: SalvageExpeditionConsole - type: ActivatableUI key: enum.SalvageConsoleUiKey.Expedition @@ -901,6 +970,8 @@ interfaces: enum.SalvageConsoleUiKey.Expedition: type: SalvageExpeditionConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: SalvageExpeditionsComputerCircuitboard - type: PointLight @@ -928,6 +999,8 @@ state: cameras - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Computer board: SurveillanceCameraMonitorCircuitboard - type: DeviceNetwork @@ -946,6 +1019,8 @@ interfaces: enum.SurveillanceCameraMonitorUiKey.Key: type: SurveillanceCameraMonitorBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: entity parent: BaseComputer @@ -963,6 +1038,8 @@ state: cameras - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Computer board: SurveillanceWirelessCameraMonitorCircuitboard - type: DeviceNetwork @@ -983,14 +1060,15 @@ interfaces: enum.SurveillanceCameraMonitorUiKey.Key: type: SurveillanceCameraMonitorBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: entity id: ComputerPalletConsole - parent: BaseComputer + parent: BaseComputerAiAccess name: cargo sale computer description: Used to sell goods loaded onto cargo pallets. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -1001,6 +1079,8 @@ state: request - map: ["computerLayerKeys"] state: tech_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Anchorable flags: - Anchorable @@ -1011,6 +1091,8 @@ interfaces: enum.CargoPalletConsoleUiKey.Sale: type: CargoPalletConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: Computer board: CargoSaleComputerCircuitboard - type: PointLight @@ -1022,12 +1104,11 @@ - Cargo - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerMassMedia name: news manager console description: Write your message to the world! components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -1038,6 +1119,8 @@ state: service - map: ["computerLayerKeys"] state: service_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: Computer board: ComputerMassMediaCircuitboard - type: DeviceNetworkRequiresPower @@ -1053,6 +1136,8 @@ interfaces: enum.NewsWriterUiKey.Key: type: NewsWriterBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: entity parent: BaseComputer @@ -1073,6 +1158,8 @@ state: sensors - map: ["computerLayerKeys"] state: atmos_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: PointLight radius: 1.5 energy: 1.6 @@ -1086,6 +1173,8 @@ interfaces: enum.SensorMonitoringConsoleUiKey.Key: type: SensorMonitoringConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: DeviceNetwork deviceNetId: AtmosDevices receiveFrequencyId: AtmosMonitor @@ -1098,12 +1187,11 @@ - type: AtmosDevice - type: entity - parent: BaseComputer + parent: BaseComputerAiAccess id: ComputerRoboticsControl name: robotics control console description: Used to remotely monitor, disable and destroy the station's cyborgs. components: - - type: StationAiWhitelist - type: Sprite layers: - map: ["computerLayerBody"] @@ -1114,6 +1202,8 @@ state: robot - map: ["computerLayerKeys"] state: rd_key + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: RoboticsConsole - type: ActiveRadio channels: @@ -1124,6 +1214,8 @@ interfaces: enum.RoboticsConsoleUiKey.Key: type: RoboticsConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface - type: ApcPowerReceiver powerLoad: 1000 - type: DeviceNetwork @@ -1153,6 +1245,8 @@ state: aiupload - map: [ "computerLayerKeys" ] state: generic_keys + - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + state: generic_panel_open - type: ApcPowerReceiver powerLoad: 1000 - type: Computer diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml index 4792bb216f3..b3c9cac9262 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml @@ -117,15 +117,15 @@ amount: 2 steps: - tool: Prying + doAfter: 1 - node: computer entity: !type:BoardNodeEntity { container: board } edges: - to: monitorUnsecured - conditions: - - !type:AllWiresCut {} steps: - - tool: Screwing + - tool: Prying + doAfter: 1 - node: monitorBroken entity: ComputerBroken diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml index 7b42ef8b753..955bae0104a 100644 --- a/Resources/Prototypes/Wires/layouts.yml +++ b/Resources/Prototypes/Wires/layouts.yml @@ -156,22 +156,35 @@ id: TrainingDefusable dummyWires: 0 wires: - - !type:ActivateWireAction - - !type:BoltWireAction - - !type:DelayWireAction - - !type:ProceedWireAction - - !type:BoomWireAction - + - !type:ActivateWireAction + - !type:BoltWireAction + - !type:DelayWireAction + - !type:ProceedWireAction + - !type:BoomWireAction + - type: wireLayout id: Jukebox dummyWires: 2 wires: - - !type:PowerWireAction - - !type:AiInteractWireAction - + - !type:PowerWireAction + - !type:AiInteractWireAction + - type: wireLayout id: AnomalyGenerator dummyWires: 2 wires: - - !type:PowerWireAction - - !type:AiInteractWireAction + - !type:PowerWireAction + - !type:AiInteractWireAction + +- type: wireLayout + id: Computer + dummyWires: 3 + wires: + - !type:PowerWireAction + +- type: wireLayout + id: ComputerAi + dummyWires: 2 + wires: + - !type:PowerWireAction + - !type:AiInteractWireAction diff --git a/Resources/Textures/Structures/Machines/computers.rsi/generic_panel_open.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_panel_open.png new file mode 100644 index 0000000000000000000000000000000000000000..ac7f9f66414fd6796d958d8e76b2182ca3fcc238 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlV zPZ!6KinzD84EdT2M2>wtl=o;sq4`%Gs|qn zIdGF`?m#}ZdL8&{1e0N|GBIsM%58kV%qJ?{HL#Ud;9JApKTYf{%rbkr1S3+S=FAmB{^%Y kXHCll=>ThEae2TylPRI>R|8u;Fq|1YUHx3vIVCg!0QoDTu>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index b6741b195d2..5355f379ab1 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273.", "size": { "x": 32, "y": 32 @@ -1013,6 +1013,10 @@ "name": "generic_keys", "directions": 4 }, + { + "name": "generic_panel_open", + "directions": 4 + }, { "name": "generic_keyboard", "directions": 4 From 9cef0f890494460727a2a5b9817fe127e8538fa5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 23 Sep 2024 10:52:54 +0000 Subject: [PATCH 063/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 629f2e6fc3f..05125344996 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Jezithyr - changes: - - message: Removed the Geras ability from Slimes - type: Remove - id: 6923 - time: '2024-07-16T22:50:17.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29731 - author: K-Dynamic changes: - message: nerfed paraylze timer of all slippable objects (including soaps, water @@ -3892,3 +3885,12 @@ id: 7422 time: '2024-09-23T07:28:42.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32395 +- author: Errant + changes: + - message: Computers now have a maintenance panel with a Power and AI wire (if AI-connected). + type: Tweak + - message: Computer deconstruction now begins with the crowbar, not the screwdriver. + type: Tweak + id: 7423 + time: '2024-09-23T10:51:48.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32273 From 097f3f23fcec1ea0d57315a0ef5254fd7ef2d163 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:12:23 +0200 Subject: [PATCH 064/561] Fix guidebook books don't have damage (#32403) --- Resources/Prototypes/Entities/Objects/Misc/books.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index 5e05f2d644f..849b7af912b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -60,6 +60,15 @@ openOnActivation: true guides: - SS14 + - type: MeleeWeapon # Should write it again since BaseGuidebook doesn't inherit BookBase + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + - type: DamageOtherOnHit + damage: + types: - type: entity id: BookSpaceEncyclopedia From 75b949b6c0692a8ae46cb3501e206187364fddc0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 23 Sep 2024 11:13:29 +0000 Subject: [PATCH 065/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 05125344996..53896ba26df 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: K-Dynamic - changes: - - message: nerfed paraylze timer of all slippable objects (including soaps, water - puddles, and clown-related items) - type: Tweak - id: 6924 - time: '2024-07-16T23:26:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27879 - author: EmoGarbage404 changes: - message: Resprited wall signs. @@ -3894,3 +3886,10 @@ id: 7423 time: '2024-09-23T10:51:48.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32273 +- author: lzk228 + changes: + - message: Guidebook books now do damage like default writeable books. + type: Fix + id: 7424 + time: '2024-09-23T11:12:23.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32403 From 9132918a5605610e21e7485dd18211a7d84f40c2 Mon Sep 17 00:00:00 2001 From: Jophire <36978900+Jophire@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:08:10 -0400 Subject: [PATCH 066/561] VIM have Passenger Access. (#32302) * Revert "Update mechs.yml" This reverts commit 4a44065b11c427581462a9bfa46fc66ff8878cf4. * Reapply "Update mechs.yml" This reverts commit fb5db29f4ae58106180ac836d01f953b816e7a61. * Revert "Reapply "Update mechs.yml"" This reverts commit c845b6bb3d3e6e80ce7a8aa290b10e2f71bca726. * Reapply "Reapply "Update mechs.yml"" This reverts commit 41b8934fd100337c31b26fc5e269f65e1f459970. * VIM Door Stuck Fix Vim No longer gets stuck in doors. * VIM has Passenger Access Debug Tested on the wrong map. Much easier solution. Just give the mech Access tags. * Moved tags to proper VIM. Moved access tag to the non-admin VIM. --- Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 99d39a82499..1fbde27e71b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -288,6 +288,9 @@ - type: MovementSpeedModifier baseWalkSpeed: 2.25 baseSprintSpeed: 3.6 + - type: Access + tags: + - Maintenance # TOOD: buzz / chime actions # TODO: builtin flashlight From bec6d61ce3ae2b3b17f12e8f10b545a5a2979b22 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 23 Sep 2024 13:09:17 +0000 Subject: [PATCH 067/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 53896ba26df..152c8c42a71 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Resprited wall signs. - type: Tweak - id: 6925 - time: '2024-07-17T04:35:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29806 - author: lzk228 changes: - message: Added health examine for caustic and cold damage. @@ -3893,3 +3886,10 @@ id: 7424 time: '2024-09-23T11:12:23.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32403 +- author: Jophire + changes: + - message: VIM mech now can open maintenance doors! + type: Add + id: 7425 + time: '2024-09-23T13:08:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32302 From 4b3d41ac0b0d6a167cf7a87c88f14d2942c83e40 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:19:15 +0000 Subject: [PATCH 068/561] fix(contraband): Make contraband work with chameleon items (#30986) * formatting --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../EntitySystems/SharedChameleonClothingSystem.cs | 13 +++++++++++++ Content.Shared/Contraband/ContrabandSystem.cs | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs index f5df04037ee..2b10b41fee8 100644 --- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Access.Components; using Content.Shared.Clothing.Components; +using Content.Shared.Contraband; using Content.Shared.Inventory; using Content.Shared.Inventory.Events; using Content.Shared.Item; @@ -13,6 +14,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem [Dependency] private readonly IComponentFactory _factory = default!; [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly ClothingSystem _clothingSystem = default!; + [Dependency] private readonly ContrabandSystem _contraband = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly SharedItemSystem _itemSystem = default!; [Dependency] private readonly TagSystem _tag = default!; @@ -68,6 +70,17 @@ protected void UpdateVisuals(EntityUid uid, ChameleonClothingComponent component { _clothingSystem.CopyVisuals(uid, otherClothing, clothing); } + + // properly mark contraband + if (proto.TryGetComponent("Contraband", out ContrabandComponent? contra)) + { + EnsureComp(uid, out var current); + _contraband.CopyDetails(uid, contra, current); + } + else + { + RemComp(uid); + } } protected virtual void UpdateSprite(EntityUid uid, EntityPrototype proto) { } diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs index 22181ce99ad..e6931f2860a 100644 --- a/Content.Shared/Contraband/ContrabandSystem.cs +++ b/Content.Shared/Contraband/ContrabandSystem.cs @@ -33,6 +33,16 @@ private void SetContrabandExamine(bool val) _contrabandExamineEnabled = val; } + public void CopyDetails(EntityUid uid, ContrabandComponent other, ContrabandComponent? contraband = null) + { + if (!Resolve(uid, ref contraband)) + return; + + contraband.Severity = other.Severity; + contraband.AllowedDepartments = other.AllowedDepartments; + Dirty(uid, contraband); + } + private void OnExamined(Entity ent, ref ExaminedEvent args) { if (!_contrabandExamineEnabled) @@ -45,7 +55,7 @@ private void OnExamined(Entity ent, ref ExaminedEvent args) using (args.PushGroup(nameof(ContrabandComponent))) { var severity = _proto.Index(ent.Comp.Severity); - if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null }) + if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null }) { // TODO shouldn't department prototypes have a localized name instead of just using the ID for this? var list = ContentLocalizationManager.FormatList(ent.Comp.AllowedDepartments.Select(p => Loc.GetString($"department-{p.Id}")).ToList()); From 20bcd03a09018bf8d378fdb8f2f332ad4c21e82d Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:49:34 +0200 Subject: [PATCH 069/561] Fix cadet pda (#32399) --- .../Entities/Objects/Devices/pda.yml | 98 +++++++------------ 1 file changed, 34 insertions(+), 64 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index b1906b23710..c7b2d770a19 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -118,6 +118,20 @@ - type: Speech speechVerb: Robotic +- type: entity + parent: BasePDA + id: BaseSecurityPDA + abstract: true + components: + - type: CartridgeLoader + diskSpace: 7 # DeltaV: increase cartridge space by 2 to fit our extra cartridges + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge # DeltaV + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - type: entity parent: BasePDA id: BaseMedicalPDA @@ -176,7 +190,7 @@ - Medical Doctor - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: SecurityCadetPDA name: security cadet PDA description: Why isn't it red? @@ -189,14 +203,6 @@ accentVColor: "#A32D26" - type: Icon state: pda-interncadet - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - type: entity parent: BasePDA @@ -396,7 +402,7 @@ parent: BasePDA id: CargoPDA name: logistics PDA # DeltaV - Logistics Department replacing Cargo - description: PDA for the guys that order the pizzas. # DeltaV - Logistics Department replacing Cargo + description: PDA for the guys that order the pizzas. components: - type: Pda id: CargoIDCard @@ -465,7 +471,7 @@ state: pda-library - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: LawyerPDA name: lawyer PDA description: For lawyers to poach dubious clients. @@ -483,14 +489,6 @@ borderColor: "#6f6192" - type: Icon state: pda-lawyer - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - type: entity parent: LawyerPDA @@ -516,7 +514,11 @@ state: pda-janitor - type: entity +<<<<<<< HEAD parent: BasePDA +======= + parent: BaseSecurityPDA +>>>>>>> 95104de117 (Fix cadet pda (#32399)) id: CaptainPDA name: captain PDA description: Surprisingly no different from your PDA. @@ -703,7 +705,11 @@ - GlimmerMonitorCartridge - type: entity +<<<<<<< HEAD parent: BasePDA +======= + parent: BaseSecurityPDA +>>>>>>> 95104de117 (Fix cadet pda (#32399)) id: HoSPDA name: head of security PDA description: Whosoever bears this PDA is the law. @@ -716,17 +722,9 @@ accentHColor: "#447987" - type: Icon state: pda-hos - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: WardenPDA name: warden PDA description: The OS appears to have been jailbroken. @@ -739,17 +737,9 @@ accentVColor: "#949137" - type: Icon state: pda-warden - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: SecurityPDA name: security PDA description: Red to hide the stains of passenger blood. @@ -761,17 +751,9 @@ borderColor: "#A32D26" - type: Icon state: pda-security - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: CentcomPDA name: CentComm PDA description: Light green sign of walking bureaucracy. @@ -912,7 +894,11 @@ - Cartridge - type: entity +<<<<<<< HEAD parent: BasePDA +======= + parent: BaseSecurityPDA +>>>>>>> 95104de117 (Fix cadet pda (#32399)) id: ERTLeaderPDA name: ERT Leader PDA suffix: Leader @@ -1060,7 +1046,7 @@ state: pda-boxer - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: DetectivePDA name: detective PDA description: Smells like rain... pouring down the rooftops... @@ -1072,14 +1058,6 @@ borderColor: "#774705" - type: Icon state: pda-detective - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - type: entity parent: BaseMedicalPDA @@ -1176,7 +1154,7 @@ state: pda-seniorphysician - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: SeniorOfficerPDA name: senior officer PDA description: Beaten, battered and broken, but just barely useable. @@ -1189,14 +1167,6 @@ accentVColor: "#DFDFDF" - type: Icon state: pda-seniorofficer - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - type: entity parent: SyndiPDA From 5c05cd24d30b6e1382f45a3ac7a585bbe934e620 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 23 Sep 2024 21:50:41 +0000 Subject: [PATCH 070/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 152c8c42a71..a9ac8ca3ae2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Added health examine for caustic and cold damage. - type: Add - id: 6926 - time: '2024-07-17T06:19:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29989 - author: lzk228 changes: - message: Surgery saws now are normal-sized (no more pocket circular saw). @@ -3893,3 +3886,10 @@ id: 7425 time: '2024-09-23T13:08:11.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32302 +- author: lzk228 + changes: + - message: Cadet PDA now has wanted list cartridge preinstalled. + type: Fix + id: 7426 + time: '2024-09-23T21:49:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32399 From 9a826a8a277907e25474bf4dc5d4b7f3710148c1 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Tue, 24 Sep 2024 00:36:05 +0100 Subject: [PATCH 071/561] Paper QOL improvements (#32418) * Don't add newlines (fixes #32357) * Improve UI around max paper length (Fixes #32344) * Display a "fill progress" indicator so users know how close they are to filling it * Don't allow users to save a paper which went over the limit, to avoid them losing data they want to keep. --------- Co-authored-by: Eoin Mcloughlin --- .../Paper/UI/PaperBoundUserInterface.cs | 5 ++ Content.Client/Paper/UI/PaperWindow.xaml | 11 +++-- Content.Client/Paper/UI/PaperWindow.xaml.cs | 49 ++++++++++++++++++- Content.Shared/Paper/PaperSystem.cs | 2 +- .../Locale/en-US/paper/paper-component.ftl | 3 ++ 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index 63645bc01e9..ec417f749b9 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -2,6 +2,7 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Utility; +using Content.Shared.Paper; using static Content.Shared.Paper.PaperComponent; namespace Content.Client.Paper.UI; @@ -23,6 +24,10 @@ protected override void Open() _window = this.CreateWindow(); _window.OnSaved += InputOnTextEntered; + if (EntMan.TryGetComponent(Owner, out var paper)) + { + _window.MaxInputLength = paper.ContentSize; + } if (EntMan.TryGetComponent(Owner, out var visuals)) { _window.InitVisuals(Owner, visuals); diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml index 2344afd5ef7..503ae928a3e 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml +++ b/Content.Client/Paper/UI/PaperWindow.xaml @@ -15,10 +15,13 @@ - - - + + + + + diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index 81b831068c3..02c4ed64c35 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -48,6 +48,20 @@ public sealed partial class PaperWindow : BaseWindow public event Action? OnSaved; + private int _MaxInputLength = -1; + public int MaxInputLength + { + get + { + return _MaxInputLength; + } + set + { + _MaxInputLength = value; + UpdateFillState(); + } + } + public PaperWindow() { IoCManager.InjectDependencies(this); @@ -63,11 +77,21 @@ public PaperWindow() { if (args.Function == EngineKeyFunctions.MultilineTextSubmit) { - RunOnSaved(); - args.Handle(); + // SaveButton is disabled when we hit the max input limit. Just check + // that flag instead of trying to calculate the input length again + if (!SaveButton.Disabled) + { + RunOnSaved(); + args.Handle(); + } } }; + Input.OnTextChanged += args => + { + UpdateFillState(); + }; + SaveButton.OnPressed += _ => { RunOnSaved(); @@ -126,6 +150,7 @@ public void InitVisuals(EntityUid entity, PaperVisualsComponent visuals) PaperContent.ModulateSelfOverride = visuals.ContentImageModulate; WrittenTextLabel.ModulateSelfOverride = visuals.FontAccentColor; + FillStatus.ModulateSelfOverride = visuals.FontAccentColor; var contentImage = visuals.ContentImagePath != null ? _resCache.GetResource(visuals.ContentImagePath) : null; if (contentImage != null) @@ -296,5 +321,25 @@ private void RunOnSaved() { OnSaved?.Invoke(Rope.Collapse(Input.TextRope)); } + + private void UpdateFillState() + { + if (MaxInputLength != -1) + { + var inputLength = Input.TextLength; + + FillStatus.Text = Loc.GetString("paper-ui-fill-level", + ("currentLength", inputLength), + ("maxLength", MaxInputLength)); + + // Disable the save button if we've gone over the limit + SaveButton.Disabled = inputLength > MaxInputLength; + } + else + { + FillStatus.Text = ""; + SaveButton.Disabled = false; + } + } } } diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs index 0f4bfef983d..211eb7eba81 100644 --- a/Content.Shared/Paper/PaperSystem.cs +++ b/Content.Shared/Paper/PaperSystem.cs @@ -201,7 +201,7 @@ public bool TryStamp(Entity entity, StampDisplayInfo stampInfo, public void SetContent(Entity entity, string content) { - entity.Comp.Content = content + '\n'; + entity.Comp.Content = content; Dirty(entity); UpdateUserInterface(entity); diff --git a/Resources/Locale/en-US/paper/paper-component.ftl b/Resources/Locale/en-US/paper/paper-component.ftl index c2d9d5712bf..7425ea2da16 100644 --- a/Resources/Locale/en-US/paper/paper-component.ftl +++ b/Resources/Locale/en-US/paper/paper-component.ftl @@ -11,6 +11,9 @@ paper-component-examine-detail-stamped-by = {CAPITALIZE(THE($paper))} {CONJUGATE paper-component-action-stamp-paper-other = {CAPITALIZE(THE($user))} stamps {THE($target)} with {THE($stamp)}. paper-component-action-stamp-paper-self = You stamp {THE($target)} with {THE($stamp)}. +# Indicator to show how full a paper is +paper-ui-fill-level = {$currentLength}/{$maxLength} + paper-ui-save-button = Save ({$keybind}) paper-tamper-proof-modified-message = This page was written using tamper-proof ink. From 63eefe060d0351c5dd8e56261873e0c7274f84ef Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 24 Sep 2024 01:38:09 +0200 Subject: [PATCH 072/561] Fix OOC not re-enabling if restartroundnow is used (#32401) The ChatSystem code for re-enabling OOC only ran during PostRound, which gets skipped over when doing restartroundnow. Now it does this on PreRoundLobby too. --- Content.Server/Chat/Systems/ChatSystem.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 02102d674a8..fe9cea6953d 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -128,6 +128,7 @@ private void OnGameChange(GameRunLevelChangedEvent ev) _configurationManager.SetCVar(CCVars.OocEnabled, false); break; case GameRunLevel.PostRound: + case GameRunLevel.PreRoundLobby: if (!_configurationManager.GetCVar(CCVars.OocEnableDuringRound)) _configurationManager.SetCVar(CCVars.OocEnabled, true); break; From dd0dcb859cfa2f412df1a164c4956b11737de720 Mon Sep 17 00:00:00 2001 From: Myra Date: Tue, 24 Sep 2024 02:31:08 +0200 Subject: [PATCH 073/561] Remove all command age requirements (#32340) From what I can tell this was merged with this on accident. Maintainers see the maint review thread on this. The original pr also claimed this was as an example. In my opinion wizden should not have an age requirement for command. --- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 -- Resources/Prototypes/Roles/Jobs/Command/captain.yml | 3 --- Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 2 -- Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml | 2 -- .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml | 2 -- Resources/Prototypes/Roles/Jobs/Science/research_director.yml | 2 -- Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml | 2 -- 7 files changed, 15 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index cb34b7352dc..3fd9e173e50 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -19,8 +19,6 @@ time: 43200 #DeltaV 12 hours - !type:OverallPlaytimeRequirement time: 144000 #40 hrs -# - !type:AgeRequirement - DeltaV - PR #1611 for context -# requiredAge: 20 weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 3dad2356391..2872da92d5f 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -24,9 +24,6 @@ time: 108000 # DeltaV - 30 hours, was 15 - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement time: 108000 # 30 hours - - !type:WhitelistRequirement # DeltaV - Whitelist requirement -# - !type:AgeRequirement - DeltaV - PR #1611 for context -# requiredAge: 20 weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index f1b23c20ebb..33e5d9d0cae 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -19,8 +19,6 @@ time: 72000 # 20 hours - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement time: 90000 # 25 hours -# - !type:AgeRequirement - DeltaV - PR #1611 for context -# requiredAge: 20 weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 18435d5775a..e57aa7fc84e 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -15,8 +15,6 @@ time: 90000 # DeltaV - 25 hours, was 10 # - !type:OverallPlaytimeRequirement # time: 144000 # DeltaV - was 40 hours upstream -# - !type:AgeRequirement - DeltaV - PR #1611 for context -# requiredAge: 20 weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 4d3fd5f9e30..bd10b26dca9 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -18,8 +18,6 @@ time: 43200 # DeltaV - 12 hours - !type:OverallPlaytimeRequirement time: 72000 # DeltaV - 20 hours, was 40 -# - !type:AgeRequirement - DeltaV - PR #1611 for context -# requiredAge: 20 weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index af262e43b0e..9cbd6a3fde1 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -10,8 +10,6 @@ time: 54000 # DeltaV - 15 hours - !type:OverallPlaytimeRequirement time: 72000 # DeltaV - 20 hours, was 40 -# - !type:AgeRequirement - DeltaV - PR #1611 for context -# requiredAge: 20 weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index f3dc8872ba9..7c95ec3c948 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -15,8 +15,6 @@ time: 36000 # 10 hours - !type:OverallPlaytimeRequirement time: 90000 # DeltaV - 25 hours, was 40 - - !type:AgeRequirement - requiredAge: 21 weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" From 2a401819fe6d114e82af2fba8d225e7059be39f1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 24 Sep 2024 00:32:14 +0000 Subject: [PATCH 074/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a9ac8ca3ae2..c4a52d8be6a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Surgery saws now are normal-sized (no more pocket circular saw). - type: Tweak - id: 6927 - time: '2024-07-17T06:26:10.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29995 - author: Winkarst-cpu changes: - message: The super door remote is now able to control Syndicate doors. @@ -3893,3 +3886,10 @@ id: 7426 time: '2024-09-23T21:49:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32399 +- author: Vasilis + changes: + - message: Removed the age requirement for command jobs. + type: Tweak + id: 7427 + time: '2024-09-24T00:31:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32340 From be03b28240b8ebe6c969a4a8db7c59d178c18af5 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:23:48 +0300 Subject: [PATCH 075/561] Allow AreaInsert pickups for one item (#32153) Update SharedStorageSystem.cs --- Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 3d7ff2edb73..002b5608861 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -454,7 +454,7 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt } //If there's only one then let's be generous - if (_entList.Count > 1) + if (_entList.Count >= 1) { var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid) { From 38451250efb7f868145eb099e2d2dce60535f17c Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 24 Sep 2024 14:24:56 +0000 Subject: [PATCH 076/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c4a52d8be6a..33542957fc0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Winkarst-cpu - changes: - - message: The super door remote is now able to control Syndicate doors. - type: Fix - id: 6928 - time: '2024-07-17T13:50:25.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30033 - author: Errant changes: - message: Vox are temporarily removed from Space Ninjas and all Unknown Shuttle @@ -3893,3 +3886,10 @@ id: 7427 time: '2024-09-24T00:31:08.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32340 +- author: whatston3 + changes: + - message: Area insert items can pick up single item sets when clicking on the floor. + type: Fix + id: 7428 + time: '2024-09-24T14:23:48.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32153 From e8827b5a8c1084efddbeb5444eb35de4de81976e Mon Sep 17 00:00:00 2001 From: LordEclipse <106132477+LordEclipse@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:06:58 -0400 Subject: [PATCH 077/561] Antimov in both Traitor & Nukie Uplinks (#31916) Adds Antimov AI Lawboard to Uplinks Automatic changelog update Co-authored-by: PJBot --- .../Locale/en-US/store/uplink-catalog.ftl | 3 ++ .../Prototypes/Catalog/uplink_catalog.yml | 38 ++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index aa0ea88daf2..4db80bd2b20 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -167,6 +167,9 @@ uplink-syndicate-martyr-module-desc = Turn your emagged borg friend into a walki uplink-singularity-beacon-name = Singularity Beacon uplink-singularity-beacon-desc = A device that attracts singularities. Has to be anchored and powered. Causes singularities to grow when consumed. +uplink-antimov-law-name = Antimov Law Circuit +uplink-antimov-law-desc = A very dangerous Lawset to use when you want to cause the A.I. to go haywire, use with caution. + # Implants uplink-storage-implanter-name = Storage Implanter uplink-storage-implanter-desc = Hide goodies inside of yourself with new bluespace technology! diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 92ff0dc62e0..b924aeef5f5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -991,11 +991,47 @@ categories: - UplinkDisruption conditions: - - !type:BuyerWhitelistCondition + - !type:BuyerWhitelistCondition blacklist: components: - SurplusBundle +- type: listing + id: UplinkAntimovCircuitBoard + name: uplink-antimov-law-name + description: uplink-antimov-law-desc + productEntity: AntimovCircuitBoard + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 10 + cost: + Telecrystal: 14 + categories: + - UplinkDisruption + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkNukieAntimovCircuitBoard + name: uplink-antimov-law-name + description: uplink-antimov-law-desc + productEntity: AntimovCircuitBoard + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 20 + cost: + Telecrystal: 24 + categories: + - UplinkDisruption + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - type: listing id: UplinkSurplusBundle name: uplink-surplus-bundle-name From eaa606de2c2ee768ad1cf49d21c36acca17805af Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 24 Sep 2024 15:08:06 +0000 Subject: [PATCH 078/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 33542957fc0..1a2649c041e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Errant - changes: - - message: Vox are temporarily removed from Space Ninjas and all Unknown Shuttle - ghostroles, until code supports giving them species-specific gear. - type: Tweak - id: 6929 - time: '2024-07-17T22:04:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30099 - author: Cojoke-dot changes: - message: You can no longer teleport objects that should not be in other objects @@ -3893,3 +3885,11 @@ id: 7428 time: '2024-09-24T14:23:48.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32153 +- author: LordEclipse + changes: + - message: The Antimov Law Board is now available in both the Traitor and Nuclear + Operative Uplinks, 14 and 24 TC respectively. + type: Add + id: 7429 + time: '2024-09-24T15:06:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31916 From ee68cc3c0a3c0b991dec328c947250e3fe7b9dea Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:19:40 +0200 Subject: [PATCH 079/561] craftable freezers (#32277) * Craftable freezers * oh i forgot that --- .../Objects/Devices/Electronics/misc.yml | 15 ++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Storage/Closets/Lockers/lockers.yml | 5 ++ .../Structures/Storage/Crates/crates.yml | 5 ++ .../Crafting/Graphs/storage/cratefreezer.yml | 42 +++++++++++++++++ .../Crafting/Graphs/storage/tallbox.yml | 43 ++++++++++++++++++ .../Prototypes/Recipes/Crafting/crates.yml | 11 +++++ .../Prototypes/Recipes/Crafting/tallbox.yml | 13 +++++- .../Prototypes/Recipes/Lathes/electronics.yml | 5 ++ Resources/Prototypes/tags.yml | 3 ++ .../Storage/closet.rsi/freezer_icon.png | Bin 0 -> 444 bytes .../Structures/Storage/closet.rsi/meta.json | 3 ++ 12 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml new file mode 100644 index 00000000000..62a4ee72947 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml @@ -0,0 +1,15 @@ +- type: entity + parent: BaseElectronics + id: FreezerElectronics + name: freezer electronics + description: An electronics board used in kitchen freezers. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: door_electronics + - type: Tag + tags: + - FreezerElectronics + - type: DoorElectronics + - type: StaticPrice + price: 55 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6162cd46f0d..75e2521115e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -198,6 +198,7 @@ - ClothingHeadHatWelding - WetFloorSign - ClothingHeadHatCone + - FreezerElectronics - Flare # Begin Delta-V additions - GoldRing diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 46364f3d1df..47bfcceedb0 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -170,6 +170,11 @@ - type: ExplosionResistance damageCoefficient: 0.50 - type: AntiRottingContainer + - type: Construction + graph: ClosetFreezer + node: done + containers: + - entity_storage - type: entity id: LockerFreezer diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index d00557c0736..7976476743b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -42,6 +42,11 @@ - type: AntiRottingContainer - type: ExplosionResistance damageCoefficient: 0.50 + - type: Construction + graph: CrateFreezer + node: done + containers: + - entity_storage - type: entity parent: CratePlastic diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml new file mode 100644 index 00000000000..a43d84e1734 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml @@ -0,0 +1,42 @@ +- type: constructionGraph + id: CrateFreezer + start: start + graph: + - node: start + edges: + - to: done + steps: + - material: Steel + amount: 5 + - material: Cable + amount: 2 + doAfter: 5 + - tag: FreezerElectronics + name: freezer electronics + icon: + sprite: Objects/Misc/module.rsi + state: door_electronics + - node: done + entity: CrateFreezer + edges: + - to: start + steps: + - tool: Screwing + doAfter: 5 + conditions: + - !type:StorageWelded + welded: false + - !type:Locked + locked: false + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 5 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + - !type:SpawnPrototype + prototype: FreezerElectronics + amount: 1 + - !type:EmptyAllContainers + - !type:DeleteEntity diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml index e72c56ff44c..17696eaaff8 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml @@ -61,6 +61,49 @@ - !type:EmptyAllContainers - !type:DeleteEntity +- type: constructionGraph + id: ClosetFreezer + start: start + graph: + - node: start + edges: + - to: done + steps: + - material: Steel + amount: 4 + - material: Cable + amount: 2 + doAfter: 5 + - tag: FreezerElectronics + name: freezer electronics + icon: + sprite: Objects/Misc/module.rsi + state: door_electronics + - node: done + entity: LockerFreezerBase + edges: + - to: start + steps: + - tool: Screwing + doAfter: 5 + conditions: + - !type:StorageWelded + welded: false + - !type:Locked + locked: false + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 4 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + - !type:SpawnPrototype + prototype: FreezerElectronics + amount: 1 + - !type:EmptyAllContainers + - !type:DeleteEntity + - type: constructionGraph id: ClosetWall start: start diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml index 72fabc2221b..25450b7d982 100644 --- a/Resources/Prototypes/Recipes/Crafting/crates.yml +++ b/Resources/Prototypes/Recipes/Crafting/crates.yml @@ -31,6 +31,17 @@ icon: { sprite: Structures/Storage/Crates/secure.rsi, state: icon } objectType: Structure +- type: construction + name: freezer + id: CrateFreezer + graph: CrateFreezer + startNode: start + targetNode: done + category: construction-category-storage + description: A metal freezing crate for storing things. + icon: { sprite: Structures/Storage/Crates/freezer.rsi, state: icon } + objectType: Structure + - type: construction name: plastic crate id: CratePlastic diff --git a/Resources/Prototypes/Recipes/Crafting/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/tallbox.yml index 21a7ec8225d..c90142de445 100644 --- a/Resources/Prototypes/Recipes/Crafting/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/tallbox.yml @@ -20,6 +20,17 @@ icon: { sprite: Structures/Storage/closet.rsi, state: secure_icon } objectType: Structure +- type: construction + id: ClosetFreezer + name: freezer + graph: ClosetFreezer + startNode: start + targetNode: done + category: construction-category-storage + description: A tall steel box with freezing abilities. + icon: { sprite: Structures/Storage/closet.rsi, state: freezer_icon } + objectType: Structure + - type: construction id: ClosetWall name: wall closet @@ -34,4 +45,4 @@ canRotate: true canBuildInImpassable: true conditions: - - !type:WallmountCondition \ No newline at end of file + - !type:WallmountCondition diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 818ba0fe374..99ff9f25eef 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -98,6 +98,11 @@ id: DoorElectronics result: DoorElectronics +- type: latheRecipe + parent: BaseCheapElectronicsRecipe + id: FreezerElectronics + result: FreezerElectronics + - type: latheRecipe parent: BaseElectronicsRecipe id: AirAlarmElectronics diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 63148e39c96..3d54fbd3a04 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -647,6 +647,9 @@ - type: Tag id: ForceNoFixRotations # fixrotations command WON'T target this +- type: Tag + id: FreezerElectronics + - type: Tag id: Fruit diff --git a/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ab148aa7cb258bcb96b2aeb109071de1672bc528 GIT binary patch literal 444 zcmV;t0Ym-ipF4kPQZ7CV zzJe)=0^vNXkMl(qga>bJoa>v8k+uaT-3j7SmPe=Fr mJ!D!{6^Z`?*c&qax1v|Y`)ZW)1JP;#0000 Date: Tue, 24 Sep 2024 15:20:46 +0000 Subject: [PATCH 080/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1a2649c041e..1cf44b4b1cc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: You can no longer teleport objects that should not be in other objects - into other objects with the Quantum Spin Inverter - type: Fix - id: 6930 - time: '2024-07-18T00:40:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29200 - author: Plykiya changes: - message: Stun batons no longer use up charges when hitting objects without stamina. @@ -3893,3 +3885,11 @@ id: 7429 time: '2024-09-24T15:06:59.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31916 +- author: lzk228 + changes: + - message: Freezer electronics added to autolathe, with which you can craft locker + freezer or crate freezer. + type: Add + id: 7430 + time: '2024-09-24T15:19:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32277 From 532f24e05c5e9c0a0c374e4f9be63d32085b1aaa Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 24 Sep 2024 17:48:32 +0200 Subject: [PATCH 081/561] fix paper staying on fire forever (#32412) okay who did that --- Resources/Prototypes/Entities/Objects/Misc/paper.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index d26bdf25c7c..0605ceb9f99 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -35,9 +35,7 @@ - type: PaperVisuals - type: Flammable fireSpread: true - canResistFire: false alwaysCombustible: true - canExtinguish: false # Mwahaha! Let the world burn because of one piece of paper! damage: types: Heat: 1 From 850c5d76ad63e70ec1f6cb1b848bb7e3dabcc37a Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 24 Sep 2024 15:49:38 +0000 Subject: [PATCH 082/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1cf44b4b1cc..f745e80ec31 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Stun batons no longer use up charges when hitting objects without stamina. - type: Fix - id: 6931 - time: '2024-07-18T00:48:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30136 - author: Sh18RW changes: - message: Moth can't eat boots with an item more @@ -3893,3 +3886,10 @@ id: 7430 time: '2024-09-24T15:19:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32277 +- author: MilonPL + changes: + - message: Paper will no longer stay on fire indefinitely. + type: Fix + id: 7431 + time: '2024-09-24T15:48:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32412 From 726ad01ccd96590c9753e86ccbd1f3bf2bc9c8c3 Mon Sep 17 00:00:00 2001 From: ArchRBX <5040911+ArchRBX@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:02:51 +0100 Subject: [PATCH 083/561] AstroNav GPS Cartridge (#32194) * initial commit * adds astronav cartridge to QM locker * changes requested in review * fix merge conflicts * fixes the statuscontrol disappearing if you eject the cartridge but still have it installed * fix notificationsenabled on salv pda proto * fixes lingering statuscontrol on eject while held --------- Co-authored-by: archrbx --- .../GPS/Components/HandheldGPSComponent.cs | 9 ---- .../GPS/Systems/HandheldGpsSystem.cs | 2 +- .../GPS/UI/HandheldGpsStatusControl.cs | 15 ++++-- .../Cartridges/AstroNavCartridgeComponent.cs | 9 ++++ .../Cartridges/AstroNavCartridgeSystem.cs | 32 +++++++++++++ Content.Server/Entry/IgnoredComponents.cs | 1 - .../GPS/Components/HandheldGPSComponent.cs | 10 ++++ .../Components/SharedHandheldGPSComponent.cs | 9 ---- .../en-US/cartridge-loader/cartridges.ftl | 31 +++++++++++++ .../Catalog/Fills/Lockers/heads.yml | 1 + .../Entities/Objects/Devices/cartridges.yml | 43 ++++++++++++++++++ .../Entities/Objects/Devices/pda.yml | 7 +++ .../Devices/cartridge.rsi/cart-nav.png | Bin 0 -> 300 bytes .../Objects/Devices/cartridge.rsi/meta.json | 8 +++- 14 files changed, 152 insertions(+), 25 deletions(-) delete mode 100644 Content.Client/GPS/Components/HandheldGPSComponent.cs create mode 100644 Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs create mode 100644 Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs create mode 100644 Content.Shared/GPS/Components/HandheldGPSComponent.cs delete mode 100644 Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs create mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png diff --git a/Content.Client/GPS/Components/HandheldGPSComponent.cs b/Content.Client/GPS/Components/HandheldGPSComponent.cs deleted file mode 100644 index 0f5271fd80c..00000000000 --- a/Content.Client/GPS/Components/HandheldGPSComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Content.Shared.GPS; - -namespace Content.Client.GPS.Components -{ - [RegisterComponent] - public sealed partial class HandheldGPSComponent : SharedHandheldGPSComponent - { - } -} diff --git a/Content.Client/GPS/Systems/HandheldGpsSystem.cs b/Content.Client/GPS/Systems/HandheldGpsSystem.cs index cc2b888da37..3f38a3b6952 100644 --- a/Content.Client/GPS/Systems/HandheldGpsSystem.cs +++ b/Content.Client/GPS/Systems/HandheldGpsSystem.cs @@ -1,4 +1,4 @@ -using Content.Client.GPS.Components; +using Content.Shared.GPS.Components; using Content.Client.GPS.UI; using Content.Client.Items; diff --git a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs index 7dcf3f29c51..57645e386e7 100644 --- a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs +++ b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs @@ -1,4 +1,4 @@ -using Content.Client.GPS.Components; +using Content.Shared.GPS.Components; using Content.Client.Message; using Content.Client.Stylesheets; using Robust.Client.GameObjects; @@ -30,6 +30,13 @@ protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); + // don't display the label if the gps component is being removed + if (_parent.Comp.LifeStage > ComponentLifeStage.Running) + { + _label.Visible = false; + return; + } + _updateDif += args.DeltaSeconds; if (_updateDif < _parent.Comp.UpdateRate) return; @@ -44,9 +51,9 @@ private void UpdateGpsDetails() var posText = "Error"; if (_entMan.TryGetComponent(_parent, out TransformComponent? transComp)) { - var pos = _transform.GetMapCoordinates(_parent.Owner, xform: transComp); - var x = (int) pos.X; - var y = (int) pos.Y; + var pos = _transform.GetMapCoordinates(_parent.Owner, xform: transComp); + var x = (int)pos.X; + var y = (int)pos.Y; posText = $"({x}, {y})"; } _label.SetMarkup(Loc.GetString("handheld-gps-coordinates-title", ("coordinates", posText))); diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs new file mode 100644 index 00000000000..fd616a1c803 --- /dev/null +++ b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs @@ -0,0 +1,9 @@ +using Content.Shared.CartridgeLoader.Cartridges; +using Content.Shared.GPS; + +namespace Content.Server.CartridgeLoader.Cartridges; + +[RegisterComponent] +public sealed partial class AstroNavCartridgeComponent : Component +{ +} diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs new file mode 100644 index 00000000000..60d14789fa0 --- /dev/null +++ b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs @@ -0,0 +1,32 @@ +using Content.Shared.CartridgeLoader; +using Content.Shared.CartridgeLoader.Cartridges; +using Content.Shared.GPS.Components; + +namespace Content.Server.CartridgeLoader.Cartridges; + +public sealed class AstroNavCartridgeSystem : EntitySystem +{ + [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnCartridgeAdded); + SubscribeLocalEvent(OnCartridgeRemoved); + } + + private void OnCartridgeAdded(Entity ent, ref CartridgeAddedEvent args) + { + EnsureComp(args.Loader); + } + + private void OnCartridgeRemoved(Entity ent, ref CartridgeRemovedEvent args) + { + // only remove when the program itself is removed + if (!_cartridgeLoaderSystem.HasProgram(args.Loader)) + { + RemComp(args.Loader); + } + } +} diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs index d9b81c8e5a5..04c45662272 100644 --- a/Content.Server/Entry/IgnoredComponents.cs +++ b/Content.Server/Entry/IgnoredComponents.cs @@ -12,7 +12,6 @@ public static class IgnoredComponents "GuideHelp", "Clickable", "Icon", - "HandheldGPS", "CableVisualizer", "SolutionItemStatus", "UIFragment", diff --git a/Content.Shared/GPS/Components/HandheldGPSComponent.cs b/Content.Shared/GPS/Components/HandheldGPSComponent.cs new file mode 100644 index 00000000000..a0af0909867 --- /dev/null +++ b/Content.Shared/GPS/Components/HandheldGPSComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.GPS.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class HandheldGPSComponent : Component +{ + [DataField] + public float UpdateRate = 1.5f; +} diff --git a/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs b/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs deleted file mode 100644 index 3c30738857b..00000000000 --- a/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ - -namespace Content.Shared.GPS -{ - public abstract partial class SharedHandheldGPSComponent : Component - { - [DataField("updateRate")] - public float UpdateRate = 1.5f; - } -} diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl index f5cda2f2a18..804da0992fa 100644 --- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl +++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl @@ -19,3 +19,34 @@ log-probe-scan = Downloaded logs from {$device}! log-probe-label-time = Time log-probe-label-accessor = Accessed by log-probe-label-number = # + +astro-nav-program-name = AstroNav + +# Wanted list cartridge +wanted-list-program-name = Wanted list +wanted-list-label-no-records = It's all right, cowboy +wanted-list-search-placeholder = Search by name and status + +wanted-list-age-label = [color=darkgray]Age:[/color] [color=white]{$age}[/color] +wanted-list-job-label = [color=darkgray]Job:[/color] [color=white]{$job}[/color] +wanted-list-species-label = [color=darkgray]Species:[/color] [color=white]{$species}[/color] +wanted-list-gender-label = [color=darkgray]Gender:[/color] [color=white]{$gender}[/color] + +wanted-list-reason-label = [color=darkgray]Reason:[/color] [color=white]{$reason}[/color] +wanted-list-unknown-reason-label = unknown reason + +wanted-list-initiator-label = [color=darkgray]Initiator:[/color] [color=white]{$initiator}[/color] +wanted-list-unknown-initiator-label = unknown initiator + +wanted-list-status-label = [color=darkgray]status:[/color] {$status -> + [suspected] [color=yellow]suspected[/color] + [wanted] [color=red]wanted[/color] + [detained] [color=#b18644]detained[/color] + [paroled] [color=green]paroled[/color] + [discharged] [color=green]discharged[/color] + *[other] none + } + +wanted-list-history-table-time-col = Time +wanted-list-history-table-reason-col = Crime +wanted-list-history-table-initiator-col = Initiator diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 5ed7b595ef6..eb32587ac07 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -19,6 +19,7 @@ - id: RubberStampApproved - id: RubberStampDenied - id: RubberStampQm + - id: AstroNavCartridge - type: entity id: LockerQuarterMasterFilled diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml index f9581149e21..21d9b0a3e02 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml @@ -93,3 +93,46 @@ - type: GuideHelp guides: - Forensics + +# DeltaV: this is replaced by SecWatch, the commit additing it isn't included +#- type: entity +# parent: BaseItem +# id: WantedListCartridge +# name: Wanted list cartridge +# description: A program to get a list of wanted persons. +# components: +# - type: Sprite +# sprite: Objects/Devices/cartridge.rsi +# state: cart-sec +# - type: Icon +# sprite: Objects/Devices/cartridge.rsi +# state: cart-sec +# - type: UIFragment +# ui: !type:WantedListUi +# - type: Cartridge +# programName: wanted-list-program-name +# icon: +# sprite: Objects/Misc/books.rsi +# state: icon_magnifier +# - type: WantedListCartridge +# - type: StealTarget +# stealGroup: WantedListCartridge + +- type: entity + parent: BaseItem + id: AstroNavCartridge + name: AstroNav cartridge + description: A program for navigation that provides GPS coordinates. + components: + - type: Sprite + sprite: Objects/Devices/cartridge.rsi + state: cart-nav + - type: Icon + sprite: Objects/Devices/cartridge.rsi + state: cart-nav + - type: Cartridge + programName: astro-nav-program-name + icon: + sprite: Objects/Devices/gps.rsi + state: icon + - type: AstroNavCartridge diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index c7b2d770a19..d8beb4c3c7a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -426,6 +426,13 @@ accentVColor: "#8900c9" - type: Icon state: pda-miner + - type: CartridgeLoader + uiKey: enum.PdaUiKey.Key + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - AstroNavCartridge - type: entity parent: BasePDA diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png new file mode 100644 index 0000000000000000000000000000000000000000..427129da0ed3c3745dda6f4c80f872b860497315 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STIXOAi)zzh>qzsLm9GpV@0y3)i7{Z&C&V0|Ns=K|!GM zuz-^+K#H#<$S?RmGGK5$aOVV2hO@vUvKXk~FbFdq&tH)O6fE>~aSXBWe|zCBSAzmi zL*Re2vv+>)&kJtX)Lrs>-)sl|?2L@d{8jP|k&_N{O1xh7rdBWB=p4I42J3s11K&F~ zvT8B-oG=zL4skrfytwB=eW3XYVIdaL9~+rpc(48DEVFIlyJ`cUu)&Rm^Hj$ Ys#v327E!^u8E83!r>mdKI;Vst0BSF1{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json index f3b02a2b2ea..e7415fe1c27 100644 --- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github)", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord), cart-nav made by ArchRBX (github)", "size": { "x": 32, "y": 32 @@ -58,6 +58,9 @@ { "name": "cart-mi" }, + { + "name": "cart-nav" + }, { "name": "cart-ord" }, @@ -70,6 +73,9 @@ { "name": "cart-s" }, + { + "name": "cart-sec" + }, { "name": "cart-tear" }, From c0f24b17484573fd4e1d1559ee0da19ff6e9cde0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 24 Sep 2024 17:03:58 +0000 Subject: [PATCH 084/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f745e80ec31..cb690f390fc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Sh18RW - changes: - - message: Moth can't eat boots with an item more - type: Fix - id: 6932 - time: '2024-07-18T22:34:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30019 - author: portfiend changes: - message: Reptilians display correct mask sprites in character customization screen. @@ -3893,3 +3886,14 @@ id: 7431 time: '2024-09-24T15:48:32.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32412 +- author: ArchRBX + changes: + - message: The AstroNav PDA cartridge has now been added, which turns your PDA into + a handheld GPS + type: Add + - message: The AstroNav cartridge has been added to the QM locker, and comes preinstalled + on salvage PDA's + type: Add + id: 7432 + time: '2024-09-24T17:02:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32194 From 7974306676bf0109e46b3411f65d4f68870857b6 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 24 Sep 2024 22:43:02 +0200 Subject: [PATCH 085/561] Fix cartesian explosion in pref loading (#32434) Lol .AsSingleQuery(). Some people's preferences wouldn't load on Lizard. Turns out the entire preferences set is loaded with a morbillion joins in a single query and one person had 240,000 (!!!) rows returned for their preferences query. Yeah. --- Content.Server/Database/ServerDbBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 3c59c36f77e..b750c13e212 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -52,7 +52,7 @@ public ServerDbBase(ISawmill opsLog) .ThenInclude(h => h.Loadouts) .ThenInclude(l => l.Groups) .ThenInclude(group => group.Loadouts) - .AsSingleQuery() + .AsSplitQuery() .SingleOrDefaultAsync(p => p.UserId == userId.UserId, cancel); if (prefs is null) From a5fd84c9aed4cfbfe7fd11d3d07f9b7b63d1bceb Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 24 Sep 2024 20:44:08 +0000 Subject: [PATCH 086/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index cb690f390fc..4dc0fbd9892 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: portfiend - changes: - - message: Reptilians display correct mask sprites in character customization screen. - type: Fix - id: 6933 - time: '2024-07-18T22:36:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30095 - author: Plykiya changes: - message: You no longer deal double damage to your first target when throwing an @@ -3897,3 +3890,10 @@ id: 7432 time: '2024-09-24T17:02:52.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32194 +- author: PJB3005 + changes: + - message: Fixed some people's preferences taking ages to load, hopefully. + type: Fix + id: 7433 + time: '2024-09-24T20:43:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32434 From 89e29c47c45c960b3f4ec0e6e62f3d846e263e66 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Tue, 24 Sep 2024 21:37:45 +0000 Subject: [PATCH 087/561] fix(BatterySelfRecharger): Fully charge BatterySelfRechargers (#30627) --- Content.Server/Power/EntitySystems/BatterySystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index 0a0f2068b58..ed2d54ffaa6 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -84,7 +84,6 @@ public override void Update(float frameTime) while (query.MoveNext(out var uid, out var comp, out var batt)) { if (!comp.AutoRecharge) continue; - if (batt.IsFullyCharged) continue; SetCharge(uid, batt.CurrentCharge + comp.AutoRechargeRate * frameTime, batt); } } @@ -138,7 +137,8 @@ public void SetCharge(EntityUid uid, float value, BatteryComponent? battery = nu var old = battery.CurrentCharge; battery.CurrentCharge = MathHelper.Clamp(value, 0, battery.MaxCharge); - if (MathHelper.CloseTo(battery.CurrentCharge, old)) + if (MathHelper.CloseTo(battery.CurrentCharge, old) && + !(old != battery.CurrentCharge && battery.CurrentCharge == battery.MaxCharge)) return; var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge); From e0a735391c47771a8c89d5e0f4055e956580c439 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:58:46 -0700 Subject: [PATCH 088/561] Most papers are no longer trash (#32343) most papers are not trash anymore --- .../Prototypes/Entities/Objects/Misc/paper.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 0605ceb9f99..5c3cd444962 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -28,7 +28,6 @@ - type: Tag tags: - Document - - Trash - Paper - type: Appearance - type: FaxableObject @@ -79,6 +78,11 @@ id: PaperScrap description: 'A crumpled up piece of white paper.' components: + - type: Tag + tags: + - Document + - Trash + - Paper - type: Sprite layers: - state: scrap @@ -176,6 +180,11 @@ visible: false - type: PaperLabelType paperType: Invoice + - type: Tag + tags: + - Document + - Trash + - Paper - type: PaperVisuals backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png" @@ -205,6 +214,11 @@ visible: false - type: PaperLabelType paperType: Bounty + - type: Tag + tags: + - Document + - Trash + - Paper - type: PaperVisuals backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png" From ae5b58305c73210d833f6e76aea8e62333a45cd5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 24 Sep 2024 21:59:53 +0000 Subject: [PATCH 089/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4dc0fbd9892..b893c13763d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: You no longer deal double damage to your first target when throwing an - item. - type: Fix - id: 6934 - time: '2024-07-19T01:08:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30115 - author: deepdarkdepths changes: - message: Removed the description about geras in the Slime guidebook section. @@ -3897,3 +3889,10 @@ id: 7433 time: '2024-09-24T20:43:02.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32434 +- author: Moomoobeef + changes: + - message: Most papers are no longer considered trash. + type: Tweak + id: 7434 + time: '2024-09-24T21:58:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32343 From 8847889eeb7be05b3efefbb22e8179a8f428b4e2 Mon Sep 17 00:00:00 2001 From: goet <6637097+goet@users.noreply.github.com> Date: Wed, 25 Sep 2024 07:21:24 +0200 Subject: [PATCH 090/561] Fix contraband never getting added to vend inventory (#32431) * fix contraband never getting added to vend inventory * Revert "fix contraband never getting added to vend inventory" This reverts commit e7fb3a60c3cb6fcbf41d7f015f13dbc7b1c1901d. * readd setter method to system * fix again without reparenting --- .../VendingMachineContrabandWireAction.cs | 11 ++++++++++- .../VendingMachines/VendingMachineSystem.cs | 12 ++++++++++++ .../VendingMachines/VendingMachineComponent.cs | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs b/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs index 22a0341fcbe..39231fbe834 100644 --- a/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs +++ b/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs @@ -7,11 +7,20 @@ namespace Content.Server.VendingMachines; [DataDefinition] public sealed partial class VendingMachineContrabandWireAction : BaseToggleWireAction { + private VendingMachineSystem _vendingMachineSystem = default!; + public override Color Color { get; set; } = Color.Green; public override string Name { get; set; } = "wire-name-vending-contraband"; public override object? StatusKey { get; } = ContrabandWireKey.StatusKey; public override object? TimeoutKey { get; } = ContrabandWireKey.TimeoutKey; + public override void Initialize() + { + base.Initialize(); + + _vendingMachineSystem = EntityManager.System(); + } + public override StatusLightState? GetLightState(Wire wire) { if (EntityManager.TryGetComponent(wire.Owner, out VendingMachineComponent? vending)) @@ -28,7 +37,7 @@ public override void ToggleValue(EntityUid owner, bool setting) { if (EntityManager.TryGetComponent(owner, out VendingMachineComponent? vending)) { - vending.Contraband = !setting; + _vendingMachineSystem.SetContraband(owner, !vending.Contraband, vending); } } diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 38407a98c72..90fe4cb7d8a 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -192,6 +192,18 @@ public void SetShooting(EntityUid uid, bool canShoot, VendingMachineComponent? c component.CanShoot = canShoot; } + /// + /// Sets the property of the vending machine. + /// + public void SetContraband(EntityUid uid, bool contraband, VendingMachineComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + component.Contraband = contraband; + Dirty(uid, component); + } + public void Deny(EntityUid uid, VendingMachineComponent? vendComponent = null) { if (!Resolve(uid, ref vendComponent)) diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index a3c7949600a..50023a023ab 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -41,6 +41,7 @@ public sealed partial class VendingMachineComponent : Component [DataField, AutoNetworkedField] public Dictionary ContrabandInventory = new(); + [DataField, AutoNetworkedField] public bool Contraband; public bool Ejecting; From 4c691aadfd807ed2888f642fbec24e84ae1fa8f7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 05:22:30 +0000 Subject: [PATCH 091/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b893c13763d..ed0af8ee39a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deepdarkdepths - changes: - - message: Removed the description about geras in the Slime guidebook section. - type: Remove - id: 6935 - time: '2024-07-19T09:04:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30140 - author: Blackern5000 changes: - message: Nuclear operatives are now able to purchase durable armor which is NOT @@ -3896,3 +3889,10 @@ id: 7434 time: '2024-09-24T21:58:46.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32343 +- author: goet + changes: + - message: Vending machines can be hacked again. + type: Fix + id: 7435 + time: '2024-09-25T05:21:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32431 From 52f6c66fd2d02a1e8cf70c725a6790cb0bd035b9 Mon Sep 17 00:00:00 2001 From: Zylofan <80375291+Zylofan@users.noreply.github.com> Date: Wed, 25 Sep 2024 06:50:15 -0400 Subject: [PATCH 092/561] Skull Helm Hand Sprite now turns (#32442) Fixed a typo for the bone helmet that made it not rotate when held in the right hand. --- .../Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json index bbb0aac6648..a470e009443 100644 --- a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json @@ -20,7 +20,7 @@ }, { "name": "inhand-right", - "direction": 4 + "directions": 4 } ] } From aaa4ab9351fcdba04a2fd9313afcf4907458a9dc Mon Sep 17 00:00:00 2001 From: keronshb <54602815+keronshb@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:27:28 -0400 Subject: [PATCH 093/561] Adds real-time charge & disabled action information to Actions (#31821) --- Content.Client/Actions/ActionsSystem.cs | 27 ++++++++ Content.Shared/Actions/BaseActionComponent.cs | 14 ++++ Content.Shared/Actions/SharedActionsSystem.cs | 64 +++++++++++++++++-- 3 files changed, 99 insertions(+), 6 deletions(-) diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index b36b0031091..57c861bd20f 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -52,6 +52,29 @@ public override void Initialize() SubscribeLocalEvent(OnEntityWorldTargetHandleState); } + public override void FrameUpdate(float frameTime) + { + base.FrameUpdate(frameTime); + + var worldActionQuery = EntityQueryEnumerator(); + while (worldActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var instantActionQuery = EntityQueryEnumerator(); + while (instantActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var entityActionQuery = EntityQueryEnumerator(); + while (entityActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + } + private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args) { if (args.Current is not InstantActionComponentState state) @@ -96,6 +119,8 @@ private void BaseHandleState(EntityUid uid, BaseActionComponent component, Ba component.Icon = state.Icon; component.IconOn = state.IconOn; component.IconColor = state.IconColor; + component.OriginalIconColor = state.OriginalIconColor; + component.DisabledIconColor = state.DisabledIconColor; component.Keywords.Clear(); component.Keywords.UnionWith(state.Keywords); component.Enabled = state.Enabled; @@ -126,6 +151,8 @@ public override void UpdateAction(EntityUid? actionId, BaseActionComponent? acti if (!ResolveActionData(actionId, ref action)) return; + action.IconColor = action.Charges < 1 ? action.DisabledIconColor : action.OriginalIconColor; + base.UpdateAction(actionId, action); if (_playerManager.LocalEntity != action.AttachedEntity) return; diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 9156f747f5c..01452bdc72e 100644 --- a/Content.Shared/Actions/BaseActionComponent.cs +++ b/Content.Shared/Actions/BaseActionComponent.cs @@ -40,6 +40,16 @@ public abstract partial class BaseActionComponent : Component /// [DataField("iconColor")] public Color IconColor = Color.White; + /// + /// The original this action was. + /// + [DataField] public Color OriginalIconColor; + + /// + /// The color the action should turn to when disabled + /// + [DataField] public Color DisabledIconColor = Color.DimGray; + /// /// Keywords that can be used to search for this action in the action menu. /// @@ -179,6 +189,8 @@ public abstract class BaseActionComponentState : ComponentState public SpriteSpecifier? Icon; public SpriteSpecifier? IconOn; public Color IconColor; + public Color OriginalIconColor; + public Color DisabledIconColor; public HashSet Keywords; public bool Enabled; public bool Toggled; @@ -209,6 +221,8 @@ protected BaseActionComponentState(BaseActionComponent component, IEntityManager Icon = component.Icon; IconOn = component.IconOn; IconColor = component.IconColor; + OriginalIconColor = component.OriginalIconColor; + DisabledIconColor = component.DisabledIconColor; Keywords = component.Keywords; Enabled = component.Enabled; Toggled = component.Toggled; diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 27563454282..76b8a1b081b 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -69,8 +69,42 @@ public override void Initialize() SubscribeAllEvent(OnActionRequest); } + public override void Update(float frameTime) + { + base.Update(frameTime); + + var worldActionQuery = EntityQueryEnumerator(); + while (worldActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + + var instantActionQuery = EntityQueryEnumerator(); + while (instantActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + + var entityActionQuery = EntityQueryEnumerator(); + while (entityActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + } + private void OnActionMapInit(EntityUid uid, BaseActionComponent component, MapInitEvent args) { + component.OriginalIconColor = component.IconColor; + if (component.Charges == null) return; @@ -326,14 +360,18 @@ public void RemoveCharges(EntityUid? actionId, int? removeCharges) Dirty(actionId.Value, action); } - public void ResetCharges(EntityUid? actionId) + public void ResetCharges(EntityUid? actionId, bool update = false, bool dirty = false) { if (!TryGetActionData(actionId, out var action)) return; action.Charges = action.MaxCharges; - UpdateAction(actionId, action); - Dirty(actionId.Value, action); + + if (update) + UpdateAction(actionId, action); + + if (dirty) + Dirty(actionId.Value, action); } private void OnActionsGetState(EntityUid uid, ActionsComponent component, ref ComponentGetState args) @@ -386,13 +424,12 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg return; var curTime = GameTiming.CurTime; - // TODO: Check for charge recovery timer - if (action.Cooldown.HasValue && action.Cooldown.Value.End > curTime) + if (IsCooldownActive(action, curTime)) return; // TODO: Replace with individual charge recovery when we have the visuals to aid it if (action is { Charges: < 1, RenewCharges: true }) - ResetCharges(actionEnt); + ResetCharges(actionEnt, true, true); BaseActionEvent? performEvent = null; @@ -1072,4 +1109,19 @@ public void SetEntityIcon(EntityUid uid, EntityUid? icon, BaseActionComponent? a action.EntityIcon = icon; Dirty(uid, action); } + + /// + /// Checks if the action has a cooldown and if it's still active + /// + protected bool IsCooldownActive(BaseActionComponent action, TimeSpan? curTime = null) + { + curTime ??= GameTiming.CurTime; + // TODO: Check for charge recovery timer + return action.Cooldown.HasValue && action.Cooldown.Value.End > curTime; + } + + protected bool ShouldResetCharges(BaseActionComponent action) + { + return action is { Charges: < 1, RenewCharges: true }; + } } From 79e8470cd507f8a27dc068189460df40462c63a2 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:41:34 -0400 Subject: [PATCH 094/561] Fix agent ID card unlimited range (#32445) * Fix agent ID card unlimited range * update order to be more optimized --- Content.Server/Access/Systems/AgentIDCardSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs index 8f1d0d4f820..4de908bc301 100644 --- a/Content.Server/Access/Systems/AgentIDCardSystem.cs +++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs @@ -32,7 +32,7 @@ public override void Initialize() private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, AfterInteractEvent args) { - if (!TryComp(args.Target, out var targetAccess) || !HasComp(args.Target) || args.Target == null) + if (args.Target == null || !args.CanReach || !TryComp(args.Target, out var targetAccess) || !HasComp(args.Target)) return; if (!TryComp(uid, out var access) || !HasComp(uid)) From 93544b4854da276a3d53702122b694e173f0b98f Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 15:42:42 +0000 Subject: [PATCH 095/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ed0af8ee39a..09674dabef3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Nuclear operatives are now able to purchase durable armor which is NOT - space-proof. - type: Add - id: 6936 - time: '2024-07-19T09:38:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29845 - author: Plykiya, slarticodefast changes: - message: Explosive pens now correctly embed into their target. @@ -3896,3 +3888,10 @@ id: 7435 time: '2024-09-25T05:21:24.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32431 +- author: themias + changes: + - message: Agent ID card can now only copy access within interaction range. + type: Fix + id: 7436 + time: '2024-09-25T15:41:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32445 From 884642fff9f9ee118f65c766139df37076c5af69 Mon Sep 17 00:00:00 2001 From: Vasilis Date: Wed, 25 Sep 2024 18:49:43 +0200 Subject: [PATCH 096/561] Remove binary channel access to silicons without laws. (#32385) Mostly feature proofing but these should not have binary access. ESPECIALLY pais Say we had malf ai and it was talking with other borgs about its plans. The owner of the pai (or any of these silicons) can just listen into this. Someone can just wake up a pai and ask it to monitor the binary channel. There's a reason the binary radio chip is a syndicate item. Some of these also have no reason to be able to talk on binary, are you gonna ask the ai to bother someone to refill your vend stock? Are you gonna clown with the AI and other borgs as a clown borg and annoy them? --- Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 5 ----- Resources/Prototypes/Entities/Objects/Fun/pai.yml | 4 ---- .../Entities/Structures/Machines/vending_machines.yml | 4 ---- 3 files changed, 13 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 857115e10f1..d5b4366e2ba 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -32,12 +32,8 @@ factions: - SimpleNeutral - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: HealthExaminable examinableTypes: @@ -396,6 +392,5 @@ - Bot - type: ActiveRadio channels: - - Binary - Common - Supply diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 4695f1c125d..ff662c2186a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -44,12 +44,8 @@ stopSearchVerbPopup: pai-system-stopped-searching - type: Examiner - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: DoAfter - type: Actions diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index f027d23fa98..90a7d711959 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -79,12 +79,8 @@ speechVerb: Robotic speechSounds: Vending - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: DoAfter - type: Electrified From 1b412a42b20c39d74a13c6e9488739f3f8ca55bb Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 16:50:51 +0000 Subject: [PATCH 097/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 09674dabef3..02a4abdc5f4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya, slarticodefast - changes: - - message: Explosive pens now correctly embed into their target. - type: Fix - id: 6937 - time: '2024-07-19T09:42:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30112 - author: ThatOneEnby1337 changes: - message: News Reporters are now able to use markup tags in their reports without @@ -3895,3 +3888,10 @@ id: 7436 time: '2024-09-25T15:41:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32445 +- author: Myra + changes: + - message: Silicon with no laws will not have binary channel access. + type: Remove + id: 7437 + time: '2024-09-25T16:49:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32385 From 70cece2497519906c1ab23a4439262f3ab2eb7e4 Mon Sep 17 00:00:00 2001 From: august-sun <45527070+august-sun@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:27:30 -0600 Subject: [PATCH 098/561] Makes the rolling pin craftable (#32285) * Makes the rolling pin craftable * Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Tools/tools.yml | 3 +++ .../Crafting/Graphs/improvised/rolling_pin.yml | 15 +++++++++++++++ .../Prototypes/Recipes/Crafting/improvised.yml | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 9d472a1e1d4..549a94859f6 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -526,3 +526,6 @@ - type: Tag tags: - RollingPin + - type: Construction + graph: WoodenRollingPin + node: rollingpin diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml new file mode 100644 index 00000000000..caa9ebbea91 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: WoodenRollingPin + start: start + graph: + - node: start + edges: + - to: rollingpin + steps: + - material: WoodPlank + amount: 2 + - material: MetalRod + amount: 1 + doAfter: 2 + - node: rollingpin + entity: RollingPin diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 38d254c1416..c87f4eb3d20 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -145,7 +145,7 @@ targetNode: shell category: construction-category-weapons objectType: Item - description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn + description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi state: improvised @@ -214,3 +214,16 @@ icon: sprite: Objects/Weapons/Bombs/pipebomb.rsi state: icon + +- type: construction + name: rolling pin + id: rollingpin + graph: WoodenRollingPin + startNode: start + targetNode: rollingpin + category: construction-category-tools + objectType: Item + description: A rolling pin, used for cooking and defending the kitchen. + icon: + sprite: Objects/Tools/rolling_pin.rsi + state: icon From be7782a747262bdd4ae50518ce77116b21ebf291 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 17:28:36 +0000 Subject: [PATCH 099/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 02a4abdc5f4..b22105e1dad 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: ThatOneEnby1337 - changes: - - message: News Reporters are now able to use markup tags in their reports without - bricking the PDAs of readers - type: Fix - id: 6938 - time: '2024-07-19T14:18:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30169 - author: themias changes: - message: Mailing units are functional again @@ -3895,3 +3887,10 @@ id: 7437 time: '2024-09-25T16:49:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32385 +- author: august-sun + changes: + - message: Rolling pins are now craftable. + type: Tweak + id: 7438 + time: '2024-09-25T17:27:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32285 From 279c7906d2f80c89dc7f9fccb8e3fff6babe1d93 Mon Sep 17 00:00:00 2001 From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Date: Wed, 25 Sep 2024 19:39:49 +0200 Subject: [PATCH 100/561] Fix Doctors Delight metabolism Rate (#32297) * Fix Doctors Delight metabolism Rate * Combine Drink and Medicine instead of halving their motabolism rate. * Removed unintentional newline. Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Remove metabolismRate since it is setting it to the default. Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index fac699baebe..6617791a633 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -876,8 +876,6 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.05 - Medicine: - effects: - !type:HealthChange damage: groups: From 6e679a85c61cdc3af1d63cfd7d2dc421e626ec7d Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 25 Sep 2024 17:40:55 +0000 Subject: [PATCH 101/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b22105e1dad..1dcd45880fc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: themias - changes: - - message: Mailing units are functional again - type: Fix - id: 6939 - time: '2024-07-20T02:31:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30174 - author: Ghagliiarghii changes: - message: Nuclear Operatives' Reinforcements now have a PDA! @@ -3894,3 +3887,11 @@ id: 7438 time: '2024-09-25T17:27:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32285 +- author: BramvanZijp + changes: + - message: Fixed an issue that caused Doctors Delight to metabolize twice the normal + speed, which also halved its effectiveness. + type: Fix + id: 7439 + time: '2024-09-25T17:39:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32297 From 998979e38e505f8e623a1c241cfaa1f66d82800d Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Thu, 26 Sep 2024 05:58:18 -0500 Subject: [PATCH 102/561] Makes `BaseAdvancedPen` abstract (#32454) Co-authored-by: Velcroboy --- Resources/Prototypes/Entities/Objects/Misc/pen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index b0a466f8913..55117e63602 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -59,6 +59,7 @@ - type: entity id: BaseAdvancedPen parent: PenEmbeddable + abstract: true components: - type: Tag tags: From 79676fd560c3ab4e0d3f8802c4b5d4abb738b77a Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Thu, 26 Sep 2024 16:46:17 +0400 Subject: [PATCH 103/561] lower frezon/n2o sale prices, make frezon take more trit (#32407) * lower gas prices * set trit ratio from 1:50 to 1:8 --- Content.Shared/Atmos/Atmospherics.cs | 2 +- Resources/Prototypes/Atmospherics/gases.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs index 611753d58d9..0fc6305afc6 100644 --- a/Content.Shared/Atmos/Atmospherics.cs +++ b/Content.Shared/Atmos/Atmospherics.cs @@ -233,7 +233,7 @@ public static class Atmospherics /// /// 1 mol of Tritium is required per X mol of oxygen. /// - public const float FrezonProductionTritRatio = 50.0f; + public const float FrezonProductionTritRatio = 8.0f; /// /// 1 / X of the tritium is converted into Frezon each tick diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index 5c703c0eae6..555fefaebc7 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -81,7 +81,7 @@ molarMass: 44 color: 8F00FF reagent: NitrousOxide - pricePerMole: 1 + pricePerMole: 0.1 - type: gas id: 8 @@ -94,4 +94,4 @@ gasMolesVisible: 0.6 color: 3a758c reagent: Frezon - pricePerMole: 3 + pricePerMole: 0.3 From f8709c1a83ef588710ba97699857a8456fcea04e Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 26 Sep 2024 12:47:24 +0000 Subject: [PATCH 104/561] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1dcd45880fc..70eb3ac41ef 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Ghagliiarghii - changes: - - message: Nuclear Operatives' Reinforcements now have a PDA! - type: Tweak - id: 6940 - time: '2024-07-20T02:59:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28088 - author: Plykiya changes: - message: Chameleon scarves now work again. @@ -3895,3 +3888,12 @@ id: 7439 time: '2024-09-25T17:39:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32297 +- author: Ilya246 + changes: + - message: Atmos gas sell prices significantly lowered. + type: Tweak + - message: Frezon now consumes significantly more tritium to produce. + type: Tweak + id: 7440 + time: '2024-09-26T12:46:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32407 From fccb0e30ed92eb7c518202c63de5a4e2bb2c6769 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Thu, 26 Sep 2024 18:32:13 +0200 Subject: [PATCH 105/561] Add Votekick functionality (#32005) --- Content.Client/Voting/UI/VoteCallMenu.xaml | 22 +- Content.Client/Voting/UI/VoteCallMenu.xaml.cs | 191 ++++++-- Content.Client/Voting/UI/VotePopup.xaml | 7 +- Content.Client/Voting/UI/VotePopup.xaml.cs | 33 +- Content.Client/Voting/VoteManager.cs | 7 +- Content.Client/Voting/VotingSystem.cs | 34 ++ Content.Server/Voting/IVoteHandle.cs | 7 +- .../Voting/Managers/IVoteManager.cs | 4 +- .../Managers/VoteManager.DefaultVotes.cs | 414 +++++++++++++++--- Content.Server/Voting/Managers/VoteManager.cs | 83 +++- Content.Server/Voting/VoteCommands.cs | 10 +- Content.Server/Voting/VoteOptions.cs | 17 +- Content.Server/Voting/VotingSystem.cs | 122 ++++++ Content.Shared/CCVar/CCVars.cs | 82 +++- Content.Shared/Voting/MsgVoteData.cs | 8 +- Content.Shared/Voting/StandardVoteType.cs | 48 +- Content.Shared/Voting/VotingEvents.cs | 30 ++ .../en-US/voting/managers/vote-manager.ftl | 13 + .../Locale/en-US/voting/ui/vote-call-menu.ftl | 19 + .../Locale/en-US/voting/ui/vote-popup.ftl | 4 +- 20 files changed, 1000 insertions(+), 155 deletions(-) create mode 100644 Content.Client/Voting/VotingSystem.cs create mode 100644 Content.Server/Voting/VotingSystem.cs create mode 100644 Content.Shared/Voting/VotingEvents.cs diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml index cb03dd6bb88..caca4fd553d 100644 --- a/Content.Client/Voting/UI/VoteCallMenu.xaml +++ b/Content.Client/Voting/UI/VoteCallMenu.xaml @@ -1,7 +1,7 @@ - + MouseFilter="Stop" MinSize="350 200"> @@ -13,16 +13,18 @@ - - - - - + + + + + + +