From 2200ff6974ce911ee8694f8f724d72caf51ca487 Mon Sep 17 00:00:00 2001 From: liltenhead <104418166+liltenhead@users.noreply.github.com> Date: Sat, 29 Jul 2023 19:35:54 -0700 Subject: [PATCH 01/30] Communications computer description change (#18444) --- .../Entities/Structures/Machines/Computers/computers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 13544c3bf0b1a2..85b221a10393f5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -516,7 +516,7 @@ parent: BaseComputer id: ComputerComms name: communications computer - description: This can be used for various important functions. Still under development. + description: A computer used to make station wide announcements, set the appropriate alert level, and call the emergency shuttle. components: - type: Sprite layers: From 874ff7e861f95c87c7d8efc4072c59b4e69503ed Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 29 Jul 2023 22:36:58 -0400 Subject: [PATCH 02/30] Automatic changelog update --- Resources/Changelog/Changelog.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 721b863a5aa229..c59caa555f9aa1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,10 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - {message: Role bans are now shown in the job preferences and latejoin interfaces., - type: Add} - id: 3876 - time: '2023-05-27T04:22:23.0000000+00:00' - author: liltenhead changes: - {message: Fix uplink typos, type: Fix} @@ -2973,3 +2967,8 @@ Entries: - {message: Added filter for bartender recipes in the guidebook, type: Add} id: 4375 time: '2023-07-29T22:59:59.0000000+00:00' +- author: liltenhead + changes: + - {message: Changed the placeholder comms computer description, type: Tweak} + id: 4376 + time: '2023-07-30T02:35:54.0000000+00:00' From f604d48c2e2bac2d41141f5202af2b9a623ef092 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sun, 30 Jul 2023 15:27:21 +1000 Subject: [PATCH 03/30] update (#18445) - Remove cap gun ammo - Add cameras around singulo - Add wires below rd office grilles - Remove tiles below rage cage grilles - Add fax machine to library - Make command and camera window be zappy - Remove perma hatchet and scythe - Fix sci artifact doors - Add curtains to dorm rooms - Power air alarm in command - Fix apc outside sci - Add a headslime to virology - Remove the centcom gas mask - Add a grille to chapel room - Open up atmos a bit - Add senior roles - Dim maints by A LOT - Change perma mv to lv - Add mass news console to reporter room - Fix engi floor outside ame room - In ame room, move racks to left and controller/fuel to right - Fix substation room below engineering, AA and missing tile - Add roundstart telecomms and remove note --- Resources/Maps/core.yml | 3608 ++++++++++++---------------- Resources/Prototypes/Maps/core.yml | 39 +- 2 files changed, 1597 insertions(+), 2050 deletions(-) diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index b4f89185a31c43..1d67f25003cd1b 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -61,7 +61,7 @@ entities: tiles: XgAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAF8AAABeAAAAXgAAAF8AAABfAAAAXwAAAFAAAABfAAAAOwAAAF4AAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABQAAAAXwAAAF8AAABeAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAXwAAAAAAAAAAAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAF8AAABeAAAAXgAAAF8AAABfAAAAXwAAAF8AAABfAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAAAAAAAAAAAAXwAAAF8AAABPAAAATwAAAF8AAAArAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAAAAAAF8AAABfAAAAUAAAAF8AAABfAAAARQAAAF4AAABeAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABPAAAAXwAAAEUAAAJeAAAAXgAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABPAAAAUAAAAF8AAABFAAADXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUAAAAFEAAANPAAAASAAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAANFAAACRQAAAEUAAAJfAAAAUAAAAF8AAABRAAABXwAAAF8AAABQAAAATwAAAF8AAABfAAAAUAAAAF8AAABFAAADRQAAAkUAAAJfAAAAUQAAAU8AAABPAAAAXwAAAFAAAABRAAADUQAAA08AAABfAAAAXwAAAF8AAABfAAAARQAAA18AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAABIAAAARQAAAEUAAAFIAAAASAAAAEUAAAFFAAADSAAAAEgAAABFAAADRQAAAkgAAABIAAAASAAAAEUAAAJIAAAASwAAA0sAAAFLAAAASwAAAUsAAAI6AAAASwAAA0sAAAFLAAADSwAAAksAAAFLAAAASwAAAksAAABLAAADSwAAAg== 0,-1: ind: 0,-1 - tiles: UAAAAFAAAABFAAADXwAAADsAAAA7AAAAOwAAAF8AAABFAAADSAAAAEUAAAJFAAACSAAAAEsAAABfAAAAXwAAAFAAAABQAAAASAAAAEUAAAE7AAAAOwAAADsAAABfAAAARQAAA0gAAABIAAAARQAAAkgAAABLAAAAXwAAABcAAAFQAAAAUAAAAEgAAABfAAAAOwAAADsAAAA7AAAAXwAAAEgAAABIAAAASAAAAEgAAABFAAABSwAAAl8AAAAXAAACRQAAA0gAAABFAAADXwAAADsAAAA7AAAAOwAAAF8AAAAXAAACSwAAAUsAAAFLAAAASwAAA0sAAABfAAAAFwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAABcAAAJfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXgAAAF4AAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF4AAABeAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAAAAAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAAAAAAAAAAAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABQAAAAXwAAAF8AAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAXwAAAF4AAABeAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXgAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAF8AAAAAAAAAAAAAAF8AAABfAAAAXwAAAFAAAABfAAAAXgAAAF4AAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABQAAAAXwAAAF8AAABeAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAXwAAAF4AAABeAAAAXwAAAF8AAABfAAAAUAAAAF8AAAA7AAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF8AAABeAAAAXgAAAF8AAABfAAAAXwAAAFAAAABfAAAAOwAAAA== + tiles: UAAAAFAAAABFAAADXwAAADsAAAA7AAAAOwAAAF8AAABFAAADSAAAAEUAAAJFAAACSAAAAEsAAABfAAAAXwAAAFAAAABQAAAASAAAAEUAAAE7AAAAOwAAADsAAABfAAAARQAAA0gAAABIAAAARQAAAkgAAABLAAAAXwAAABcAAAFQAAAAUAAAAEgAAABfAAAAOwAAADsAAAA7AAAAXwAAAEgAAABIAAAASAAAAEgAAABFAAABSwAAAl8AAAAXAAACRQAAA0gAAABFAAADXwAAADsAAAA7AAAAOwAAAF8AAAAXAAACSwAAAUsAAAFLAAAASwAAA0sAAABfAAAAFwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAABcAAAJfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXgAAAF4AAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAF4AAABeAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAAAAAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAAAAAAAAAAAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAXwAAAF4AAABeAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXgAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAF8AAAAAAAAAAAAAAF8AAABfAAAAXwAAAFAAAABfAAAAXgAAAF4AAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABQAAAAXwAAAF8AAABeAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAXwAAAF4AAABeAAAAXwAAAF8AAABfAAAAUAAAAF8AAAA7AAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF8AAABeAAAAXgAAAF8AAABfAAAAXwAAAFAAAABfAAAAOwAAAA== -1,-1: ind: -1,-1 tiles: TwAAAF8AAAAXAAABFwAAA0UAAAJIAAAARQAAAV8AAABfAAAAXwAAAF8AAABfAAAAUAAAAEUAAAFFAAACUAAAAFAAAABfAAAAFwAAAhcAAAFFAAACSAAAAEUAAABfAAAAXwAAAF8AAABfAAAAXwAAAFAAAABFAAADRQAAAVAAAABfAAAAXwAAABcAAAAXAAADSAAAAEUAAAFIAAAAXwAAAF8AAABfAAAAXwAAAF8AAABQAAAARQAAAkgAAABQAAAAXwAAAF8AAAAXAAADFwAAA0UAAAMXAAADFwAAAV8AAABfAAAAXwAAAF8AAABfAAAAUAAAAEUAAABIAAAARQAAAl8AAABfAAAAXwAAAF8AAABIAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUQAAAl8AAABQAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAFEAAANfAAAAUAAAAF8AAABfAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAXgAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAF4AAABQAAAAXwAAAF8AAABQAAAAXwAAAF8AAABfAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAUAAAAF8AAABfAAAAXwAAAAAAAAAAAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAAAAAAAAAAAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAATwAAAF8AAABQAAAAXwAAAF8AAABfAAAAXgAAAF4AAABfAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXwAAAE8AAABfAAAAUAAAAF8AAABfAAAAXwAAAAAAAAAAAAAAXwAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAF8AAABQAAAAXwAAAFAAAABfAAAAXwAAAF8AAAAAAAAAAAAAAF8AAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAABfAAAAUAAAAF8AAABQAAAAXwAAAF8AAABfAAAAXgAAAF4AAABfAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXwAAAF4AAABeAAAAXwAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAA== @@ -73,7 +73,7 @@ entities: tiles: RQAAAkUAAAFFAAAARQAAAkgAAABFAAADRQAAAkUAAANIAAAASAAAAEUAAANFAAADSAAAAEgAAABFAAABRQAAAksAAAJLAAACSwAAAUsAAANLAAABSwAAAUsAAAFLAAACSwAAA0sAAANLAAADSwAAAksAAANLAAADSwAAAksAAAJIAAAASAAAAEUAAAJFAAABRQAAAUUAAAFFAAACRQAAA0UAAANIAAAARQAAAEUAAAJFAAABSAAAAEgAAABFAAADXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAAJIAAAARQAAAUgAAABFAAADXwAAABcAAAIXAAABFwAAABcAAAEXAAAAXwAAAFwAAAEXAAABTwAAAF8AAABFAAADSAAAAEUAAABFAAABRQAAAl8AAAAXAAAAFwAAAxcAAAMXAAABFwAAAxcAAAJcAAACXwAAAF8AAABfAAAAFwAAAhcAAAAXAAADFwAAAxcAAAFfAAAAFwAAAhcAAAIXAAADFwAAAhcAAAEXAAADXAAAAV8AAABfAAAAXwAAAF8AAAAXAAADXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAXAAACFwAAAxcAAAFFAAADRQAAA0gAAABIAAAARQAAAEgAAABFAAABRQAAAUgAAABIAAAAXwAAAFEAAAJfAAAAFwAAARcAAAAXAAACSwAAAEsAAABLAAADOgAAAUsAAAFLAAAASwAAAzoAAAFLAAAAOgAAAV8AAAAXAAABXwAAABcAAAAXAAABFwAAA0UAAAFIAAAASAAAAEUAAANIAAAASAAAAEUAAAJFAAACRQAAAEgAAABfAAAAXwAAAF8AAABfAAAAFwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAXAAAAFwAAABcAAAEXAAACXwAAAF8AAAAXAAABFwAAA0UAAAEXAAACFwAAAxcAAAAXAAABFwAAAxcAAAFfAAAAFwAAAxcAAAIXAAAAFwAAA18AAABfAAAAFwAAARcAAAFFAAACRQAAAEgAAABFAAACRQAAAkgAAABFAAACXwAAAF8AAABfAAAAXwAAAF8AAABQAAAAXwAAABcAAAIXAAAARQAAA0UAAANIAAAARQAAA0gAAABFAAABRQAAAEUAAABFAAACSAAAAEgAAABFAAABTwAAAF8AAAAXAAABFwAAA0UAAABIAAAARQAAA0UAAABFAAACFwAAAUUAAABfAAAARQAAA0gAAABFAAADUAAAAA== 0,-2: ind: 0,-2 - tiles: SAAAAEgAAABFAAADSAAAAEUAAANfAAAARQAAA0UAAABFAAADRQAAAl8AAAAXAAAAFwAAARcAAAIXAAADFwAAAksAAABLAAABSwAAA0sAAAFFAAABXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAACRQAAAkgAAABLAAADRQAAA0gAAABFAAACRQAAAkgAAABIAAAARQAAAUUAAAFFAAAASAAAAEgAAABFAAACXwAAAF8AAABFAAADOgAAAEsAAAJLAAAAOgAAAUsAAAFLAAAAOgAAA0sAAABLAAABSwAAA0sAAAFLAAACSwAAAVwAAANfAAAARQAAAkUAAABIAAAARQAAAkUAAABFAAADSAAAAEgAAABFAAABRQAAAkgAAABIAAAARQAAAEUAAANcAAADXwAAABcAAAAXAAABFwAAABcAAAEXAAABXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXAAAA18AAAAXAAADFwAAAxcAAAEXAAAAFwAAA18AAAAXAAACFwAAA18AAABfAAAAXwAAABcAAAMXAAADXwAAAF8AAABfAAAAXwAAAF8AAAAXAAADXwAAAF8AAABfAAAAFwAAAhcAAAEXAAACFwAAABcAAAAXAAABFwAAAl8AAABFAAABSAAAAEgAAABFAAABSAAAAEgAAAAXAAACXwAAABcAAAEXAAABFwAAAhcAAAEXAAAAFwAAAxcAAAFfAAAASwAAADoAAABLAAABOgAAAEsAAANLAAADFwAAAV8AAAAXAAABFwAAAxcAAAIXAAADFwAAAxcAAAAXAAACXwAAAEgAAABFAAABRQAAA0gAAABFAAAASwAAAxcAAAJfAAAAFwAAAhcAAAFQAAAAUAAAAFAAAAAXAAADFwAAAF8AAAAXAAACRQAAAkUAAABIAAAASAAAAEsAAAMXAAADXwAAABcAAAEXAAABUAAAAFAAAABQAAAAFwAAARcAAABfAAAAFwAAAEUAAAFFAAADRQAAAkgAAABLAAAARQAAAl8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAADSwAAA0sAAABLAAACSwAAA0sAAAJLAAACSwAAAksAAANLAAABXwAAABcAAAJIAAAARQAAAkUAAAJfAAAAKwAAACsAAAArAAAARQAAAEUAAAJIAAAASAAAAEUAAAJIAAAASwAAAl8AAAAXAAAAUAAAAFAAAABIAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAADRQAAAkUAAAJFAAACSAAAAEsAAAEXAAAAFwAAAA== + tiles: SAAAAEgAAABFAAADSAAAAEUAAANfAAAARQAAA0UAAABFAAADRQAAAl8AAAAXAAAAFwAAARcAAAIXAAADFwAAAksAAABLAAABSwAAA0sAAAFFAAABXwAAAF8AAABFAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAACRQAAAkgAAABLAAADRQAAA0gAAABFAAACRQAAAkgAAABIAAAARQAAAUUAAAFFAAAASAAAAEgAAABFAAACXwAAAF8AAABFAAADOgAAAEsAAAJLAAAAOgAAAUsAAAFLAAAAOgAAA0sAAABLAAABSwAAA0sAAAFLAAACSwAAAVwAAANfAAAARQAAAkUAAABIAAAARQAAAkUAAABFAAADSAAAAEgAAABFAAABRQAAAkgAAABIAAAARQAAAEUAAANcAAADXwAAABcAAAAXAAABFwAAABcAAAEXAAABXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXAAAA18AAAAXAAADFwAAAxcAAAEXAAAAFwAAA18AAAAXAAACFwAAA18AAABfAAAAXwAAABcAAAMXAAADXwAAAF8AAABfAAAAXwAAAF8AAAAXAAADXwAAAF8AAABfAAAAFwAAAhcAAAEXAAACFwAAABcAAAAXAAABFwAAAl8AAABFAAABSAAAAEgAAABFAAABSAAAAEgAAAAXAAACXwAAABcAAAEXAAABFwAAAhcAAAEXAAAAFwAAAxcAAAFfAAAASwAAADoAAABLAAABOgAAAEsAAANLAAADFwAAAV8AAAAXAAABFwAAAxcAAAIXAAADFwAAAxcAAAAXAAACXwAAAEgAAABFAAABRQAAA0gAAABFAAAASwAAAxcAAAJfAAAAFwAAAhcAAAFQAAAAUAAAAFAAAAAXAAADFwAAAF8AAAAXAAACRQAAAkUAAABIAAAASAAAAEsAAAMXAAADXwAAABcAAAEXAAABUAAAAFAAAABQAAAAFwAAARcAAABfAAAAFwAAAEUAAAFFAAADRQAAAkgAAABLAAAARQAAAl8AAABfAAAAXwAAAF8AAABLAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAADSwAAA0sAAABLAAACSwAAA0sAAAJLAAACSwAAAksAAANLAAABXwAAABcAAAJIAAAARQAAAkUAAAJfAAAAKwAAACsAAAArAAAARQAAAEUAAAJIAAAASAAAAEUAAAJIAAAASwAAAl8AAAAXAAAAUAAAAFAAAABIAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAADRQAAAkUAAAJFAAACSAAAAEsAAAEXAAAAFwAAAA== 1,-2: ind: 1,-2 tiles: FwAAABcAAAIXAAABXwAAABcAAAAXAAABFwAAA18AAAAXAAACXAAAAVwAAANcAAAAXAAAAysAAAAXAAABFwAAAV8AAABfAAAAXwAAAF8AAAAXAAACFwAAARcAAAIXAAAAFwAAAlwAAAFcAAACXAAAAlwAAAJcAAABXAAAA1wAAABFAAADSAAAAEUAAANfAAAAFwAAABcAAAAXAAAAXwAAABcAAABcAAAAXAAAAVwAAABcAAACXwAAABcAAAAXAAADSwAAAEsAAANFAAACXwAAAEUAAAAXAAADFwAAAl8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAAFfAAAAXwAAAEgAAABLAAACSAAAAF8AAABFAAAASAAAAEUAAABfAAAAXAAAA1wAAANcAAABRQAAARcAAAAXAAACFwAAABcAAAJIAAAASwAAAUgAAABfAAAARQAAAkUAAAFFAAACXwAAAFwAAABcAAACXAAAA0UAAAEXAAABFwAAAxcAAAIXAAABRQAAAUsAAANFAAAAXwAAAEUAAABIAAAARQAAAF8AAABcAAABXAAAAVwAAAFFAAABFwAAARcAAAIXAAABFwAAAEgAAABLAAAASAAAAF8AAABfAAAARQAAAkUAAAFfAAAAWwAAAlsAAAJbAAABRQAAAEUAAAFfAAAAXwAAAF8AAABIAAAASwAAA0UAAAFfAAAARQAAAEgAAABIAAAAXwAAAF8AAABFAAADRQAAAkUAAAJFAAAASAAAAEgAAABIAAAARQAAAEsAAAJFAAAARQAAA0gAAABFAAAARQAAA0gAAABFAAABRQAAA0UAAANFAAADSAAAAEUAAAFFAAACRQAAA0UAAAFLAAAAOgAAAEsAAAJLAAABOgAAAEsAAANLAAAAOgAAAEsAAABLAAADSwAAAksAAANLAAAASwAAAksAAANIAAAASAAAAEgAAABFAAABSAAAAEgAAABFAAACRQAAAUUAAAFFAAABRQAAAUgAAABFAAACFwAAAEgAAABIAAAAXwAAAF8AAABfAAAAXwAAAEUAAABFAAACRQAAAV8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAABcAAAIXAAABXwAAAEUAAAFFAAADSAAAAEgAAAAXAAAAXwAAAF8AAABfAAAATwAAAF8AAABfAAAARQAAAUUAAAAXAAABFwAAAV8AAABFAAABSAAAAEUAAAFFAAABFwAAA18AAABfAAAAXwAAAE8AAABfAAAAXwAAAF8AAABfAAAAFwAAABcAAAIXAAABFwAAARcAAAEXAAABFwAAARcAAAMXAAABXwAAAF8AAABPAAAAXwAAAF8AAABRAAABUQAAAw== @@ -253,7 +253,7 @@ entities: tiles: XwAAAF8AAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== 5,0: ind: 5,0 - tiles: UAAAABwAAAFFAAABSAAAAEUAAAJFAAACHAAAAl8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAANLAAADSAAAAEUAAANFAAACSAAAABwAAABfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAASwAAAkUAAANIAAAARQAAAEgAAAAcAAADXwAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAABwAAAJIAAAARQAAA0UAAANFAAACHAAAAl8AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAcAAADHAAAAhwAAAEcAAACHAAAAxwAAAJfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAhcAAAAXAAABFwAAAhcAAAIXAAABXwAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAFIAAAARQAAAUUAAAJFAAADSAAAAF8AAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLAAADSwAAAksAAAJLAAABSwAAAUgAAABfAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASwAAAUsAAAFLAAABSwAAAEsAAAFIAAAAXwAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAFFAAABSAAAAEUAAABIAAAARQAAAEgAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAABFwAAAxcAAAMXAAACFwAAAxcAAAJfAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAhcAAAIXAAACFwAAABcAAAAXAAABXwAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAIXAAACFwAAABcAAAAXAAAAFwAAA18AAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAACIAAAAiAAABXwAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: UAAAAF8AAABFAAABSAAAAEUAAAJFAAACXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAANLAAADSAAAAEUAAANFAAACSAAAAF8AAABfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAASwAAAkUAAANIAAAARQAAAEgAAABfAAAAXwAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAF8AAABIAAAARQAAA0UAAANFAAACXwAAAF8AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAhcAAAAXAAABFwAAAhcAAAIXAAABXwAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAFIAAAARQAAAUUAAAJFAAADSAAAAF8AAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABLAAADSwAAAksAAAJLAAABSwAAAUgAAABfAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASwAAAUsAAAFLAAABSwAAAEsAAAFIAAAAXwAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEUAAAFFAAABSAAAAEUAAABIAAAARQAAAEgAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAABFwAAAxcAAAMXAAACFwAAAxcAAAJfAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAhcAAAIXAAACFwAAABcAAAAXAAABXwAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAIXAAACFwAAABcAAAAXAAAAFwAAA18AAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAACIAAAAiAAABXwAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== 5,1: ind: 5,1 tiles: XwAAACsAAAAiAAABXwAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAAArAAAAIgAAAF8AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== @@ -265,7 +265,7 @@ entities: tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAQQAAAAEAAABAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAEEAAACBAAAAQQAAAEEAAAABAAAAAQAAAIAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAABBAAAAAQAAAAEAAACBAAAAAQAAAEEAAACBAAAAV8AAAAEAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAQQAAAIEAAABBAAAAQQAAAIEAAACBAAAAgQAAABfAAAABAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAMEAAAAIgAAAiIAAAMiAAACBAAAAAQAAAEEAAAAXwAAAAQAAAIEAAAABAAAAQAAAAAAAAAAAAAAAAAAAABcAAABXAAAASsAAAAiAAAAIgAAACIAAAAEAAAABAAAAV8AAAAEAAACBAAAAQQAAAEAAAAAAAAAAAAAAAAAAAAAXAAAAgQAAAArAAAAKwAAACIAAAMEAAABBAAAAQQAAAIEAAABBAAAAAQAAAAEAAABBAAAAgAAAAAAAAAAAAAAAF8AAAAEAAABBAAAAisAAAArAAAABAAAAgQAAAEEAAABBAAAAgQAAAAEAAAABAAAAgQAAAAAAAAAAAAAAAAAAABfAAAABAAAAAQAAAAEAAACBAAAAAQAAAIEAAABBAAAAAQAAAEEAAABBAAAAQQAAAEEAAACBAAAAQAAAAAAAAAAXwAAAAQAAAIEAAAABAAAAgQAAAEEAAACBAAAAAQAAAIEAAAABAAAAgQAAAEEAAACBAAAAgQAAAEAAAAAAAAAAA== 5,-1: ind: 5,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAFwAAARcAAAIXAAACFwAAARcAAAIXAAACXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAABwAAAAcAAACHAAAARwAAAAcAAABHAAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAFwAAARcAAAIXAAACFwAAARcAAAIXAAACXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== 1,-4: ind: 1,-4 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAABBAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAEEAAABXwAAAAQAAAEEAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAIEAAACAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAABAAAAgQAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAABBAAAAgQAAAEEAAAABAAAAAQAAAFfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAQQAAAEEAAABBAAAAQQAAAIEAAABXwAAAAQAAAAEAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAACBAAAAgQAAAEEAAACBAAAAl8AAAAEAAABBAAAAgQAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAACBAAAAAQAAAIEAAAABAAAAAQAAAEEAAAABAAAAAQAAAIEAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAACBAAAAgQAAAEEAAAABAAAAgQAAAEEAAACBAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAF8AAAAEAAAABAAAAgQAAAEEAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== @@ -7314,16 +7314,18 @@ entities: parent: 2 type: Transform - ShutdownSubscribers: - - 460 + - 7313 + - 7663 - 10411 - 10127 - - 7470 + - 17588 type: DeviceNetwork - devices: - - 460 + - 7313 + - 7663 - 10411 - 10127 - - 7470 + - 17588 type: DeviceList - uid: 51 components: @@ -8379,11 +8381,6 @@ entities: - pos: 18.5,-16.5 parent: 2 type: Transform - - uid: 101 - components: - - pos: 14.5,-9.5 - parent: 2 - type: Transform - uid: 102 components: - rot: 3.141592653589793 rad @@ -8653,12 +8650,6 @@ entities: type: Transform - proto: AirlockEngineering entities: - - uid: 137 - components: - - rot: 1.5707963267948966 rad - pos: 7.5,-30.5 - parent: 2 - type: Transform - uid: 18598 components: - rot: 1.5707963267948966 rad @@ -8697,6 +8688,11 @@ entities: type: Transform - proto: AirlockEngineeringLocked entities: + - uid: 137 + components: + - pos: 7.5,-30.5 + parent: 2 + type: Transform - uid: 138 components: - pos: -29.5,30.5 @@ -10120,18 +10116,6 @@ entities: - pos: 29.5,16.5 parent: 2 type: Transform -- proto: AirlockScience - entities: - - uid: 361 - components: - - pos: 57.5,-11.5 - parent: 2 - type: Transform - - uid: 362 - components: - - pos: 57.5,-7.5 - parent: 2 - type: Transform - proto: AirlockScienceGlassLocked entities: - uid: 363 @@ -10173,6 +10157,16 @@ entities: type: Transform - proto: AirlockScienceLocked entities: + - uid: 361 + components: + - pos: 57.5,-7.5 + parent: 2 + type: Transform + - uid: 362 + components: + - pos: 57.5,-11.5 + parent: 2 + type: Transform - uid: 370 components: - rot: -1.5707963267948966 rad @@ -10818,10 +10812,6 @@ entities: - pos: 26.5,-10.5 parent: 2 type: Transform - - ShutdownSubscribers: - - 7259 - - 50 - type: DeviceNetwork - uid: 461 components: - pos: 35.5,-26.5 @@ -11098,6 +11088,15 @@ entities: - pos: 21.5,11.5 parent: 2 type: Transform + - uid: 17588 + components: + - rot: 3.141592653589793 rad + pos: 25.5,-7.5 + parent: 2 + type: Transform + - ShutdownSubscribers: + - 50 + type: DeviceNetwork - proto: AltarConvertMaint entities: - uid: 495 @@ -11122,83 +11121,71 @@ entities: type: Transform - proto: AmeController entities: - - uid: 497 + - uid: 504 components: - - pos: 8.5,-20.5 + - pos: 13.5,-20.5 parent: 2 type: Transform - proto: AmePart entities: - - uid: 498 + - uid: 17575 components: - - rot: -1.5707963267948966 rad - pos: 13.282769,-20.443481 + - pos: 8.513828,-20.48204 parent: 2 type: Transform - - uid: 499 + - uid: 17576 components: - - rot: -1.5707963267948966 rad - pos: 13.360894,-20.495565 + - pos: 8.357578,-20.336206 parent: 2 type: Transform - - uid: 500 + - uid: 17596 components: - - rot: -1.5707963267948966 rad - pos: 13.465061,-20.534628 + - pos: 8.659662,-20.617456 parent: 2 type: Transform - - uid: 501 + - uid: 17597 components: - - rot: -1.5707963267948966 rad - pos: 13.582249,-20.58671 + - pos: 9.420078,-20.315374 parent: 2 type: Transform - - uid: 502 + - uid: 17598 components: - - rot: -1.5707963267948966 rad - pos: 13.569228,-20.287231 + - pos: 9.555495,-20.45079 parent: 2 type: Transform - - uid: 503 + - uid: 17599 components: - - rot: -1.5707963267948966 rad - pos: 13.712457,-20.365356 + - pos: 9.690912,-20.627874 parent: 2 type: Transform - - uid: 504 + - uid: 17600 components: - - rot: -1.5707963267948966 rad - pos: 14.441624,-20.391397 + - pos: 9.263828,-20.429956 parent: 2 type: Transform - - uid: 505 + - uid: 17601 components: - - rot: -1.5707963267948966 rad - pos: 14.597874,-20.482544 + - pos: 9.347162,-20.554956 parent: 2 type: Transform - - uid: 506 + - uid: 17602 components: - - rot: -1.5707963267948966 rad - pos: 14.733335,-20.576292 + - pos: 9.420078,-20.711206 parent: 2 type: Transform - - uid: 18976 + - uid: 17603 components: - - rot: -1.5707963267948966 rad - pos: 14.308623,-20.508722 + - pos: 8.274245,-20.51329 parent: 2 type: Transform - - uid: 18977 + - uid: 17604 components: - - rot: -1.5707963267948966 rad - pos: 14.391956,-20.560806 + - pos: 8.357578,-20.648706 parent: 2 type: Transform - - uid: 18978 + - uid: 17605 components: - - rot: -1.5707963267948966 rad - pos: 14.485706,-20.623306 + - pos: 8.461745,-20.773706 parent: 2 type: Transform - proto: AnalysisComputerCircuitboard @@ -14343,13 +14330,6 @@ entities: pos: 63.479973,7.619277 parent: 2 type: Transform -- proto: BoxCartridgeCap - entities: - - uid: 17117 - components: - - pos: 70.60637,30.319567 - parent: 2 - type: Transform - proto: BoxFolderBase entities: - uid: 867 @@ -14525,6 +14505,13 @@ entities: - pos: 67.99213,17.71795 parent: 2 type: Transform +- proto: BoxSyringe + entities: + - uid: 17574 + components: + - pos: 58.484467,4.6758513 + parent: 2 + type: Transform - proto: BoxTrashbag entities: - uid: 883 @@ -14611,6 +14598,8 @@ entities: - pos: 82.5,4.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 894 components: - pos: 51.5,-12.5 @@ -26751,8 +26740,6 @@ entities: - pos: 11.5,-19.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - uid: 3151 components: - pos: 11.5,-20.5 @@ -27117,16 +27104,74 @@ entities: type: Transform - enabled: True type: AmbientSound + - uid: 6229 + components: + - pos: 58.5,-8.5 + parent: 2 + type: Transform + - uid: 6251 + components: + - pos: -13.5,39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 6253 + components: + - pos: -13.5,45.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 6254 + components: + - pos: -13.5,43.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 6255 + components: + - pos: -13.5,40.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 6256 + components: + - pos: -11.5,38.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 6257 + components: + - pos: -8.5,38.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 9530 components: - pos: 81.5,4.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 9535 components: - pos: 81.5,3.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound + - uid: 10129 + components: + - pos: -13.5,51.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 10900 components: - pos: -17.5,29.5 @@ -27137,31 +27182,165 @@ entities: - pos: 81.5,0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 10947 components: - pos: 86.5,-0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 10948 components: - pos: 85.5,-0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 11083 components: - pos: 79.5,2.5 parent: 2 type: Transform + - uid: 11131 + components: + - pos: -13.5,52.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 11261 components: - pos: 77.5,1.5 parent: 2 type: Transform + - uid: 11394 + components: + - pos: -13.5,54.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 11395 + components: + - pos: -12.5,54.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 11620 + components: + - pos: -11.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 11623 + components: + - pos: -6.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 11920 + components: + - pos: -2.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 11956 components: - pos: 83.5,-0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound + - uid: 11970 + components: + - pos: -1.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 11977 + components: + - pos: 3.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 11978 + components: + - pos: 4.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 11999 + components: + - pos: 8.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12021 + components: + - pos: 9.5,46.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12022 + components: + - pos: 7.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12023 + components: + - pos: 9.5,48.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12035 + components: + - pos: 9.5,43.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12057 + components: + - pos: 9.5,42.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12059 + components: + - pos: 9.5,38.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12060 + components: + - pos: 9.5,35.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 12209 + components: + - pos: -13.5,46.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 12564 components: - pos: 39.5,-13.5 @@ -27177,6 +27356,20 @@ entities: - pos: 12.5,26.5 parent: 2 type: Transform + - uid: 13431 + components: + - pos: -13.5,44.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 13676 + components: + - pos: -13.5,41.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 14073 components: - pos: 12.5,29.5 @@ -27184,6 +27377,20 @@ entities: type: Transform - enabled: True type: AmbientSound + - uid: 14212 + components: + - pos: -12.5,38.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 14236 + components: + - pos: -9.5,38.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 15077 components: - pos: -16.5,29.5 @@ -28221,6 +28428,449 @@ entities: - pos: 2.5,30.5 parent: 2 type: Transform + - uid: 17444 + components: + - pos: -13.5,50.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17484 + components: + - pos: -13.5,49.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17486 + components: + - pos: -13.5,53.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17487 + components: + - pos: -12.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17488 + components: + - pos: -10.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17489 + components: + - pos: -5.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17496 + components: + - pos: -0.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17497 + components: + - pos: -4.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17498 + components: + - pos: 1.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17499 + components: + - pos: 5.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17500 + components: + - pos: 8.5,54.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17501 + components: + - pos: 9.5,51.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17502 + components: + - pos: 9.5,49.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17503 + components: + - pos: 9.5,47.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17504 + components: + - pos: 9.5,40.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17505 + components: + - pos: 9.5,39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17506 + components: + - pos: 9.5,36.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17508 + components: + - pos: 58.5,-10.5 + parent: 2 + type: Transform + - uid: 17547 + components: + - pos: -8.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17550 + components: + - pos: -9.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17551 + components: + - pos: -10.5,38.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17552 + components: + - pos: -13.5,38.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17553 + components: + - pos: -13.5,42.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17554 + components: + - pos: -13.5,47.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17555 + components: + - pos: -13.5,48.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17556 + components: + - pos: -7.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17561 + components: + - pos: -3.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17562 + components: + - pos: 0.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17563 + components: + - pos: 2.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17564 + components: + - pos: 6.5,55.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17565 + components: + - pos: 9.5,52.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17566 + components: + - pos: 9.5,54.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17567 + components: + - pos: 9.5,50.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17568 + components: + - pos: 9.5,44.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17569 + components: + - pos: 9.5,45.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17570 + components: + - pos: 9.5,53.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17615 + components: + - pos: 36.5,-29.5 + parent: 2 + type: Transform + - uid: 17616 + components: + - pos: 37.5,-29.5 + parent: 2 + type: Transform + - uid: 17617 + components: + - pos: 20.5,-30.5 + parent: 2 + type: Transform + - uid: 17618 + components: + - pos: 20.5,-29.5 + parent: 2 + type: Transform + - uid: 17619 + components: + - pos: 23.5,-34.5 + parent: 2 + type: Transform + - uid: 17620 + components: + - pos: 24.5,-34.5 + parent: 2 + type: Transform + - uid: 17621 + components: + - pos: 25.5,-34.5 + parent: 2 + type: Transform + - uid: 17622 + components: + - pos: 26.5,-34.5 + parent: 2 + type: Transform + - uid: 17623 + components: + - pos: 27.5,-34.5 + parent: 2 + type: Transform + - uid: 17624 + components: + - pos: 28.5,-34.5 + parent: 2 + type: Transform + - uid: 17625 + components: + - pos: 29.5,-34.5 + parent: 2 + type: Transform + - uid: 17626 + components: + - pos: 30.5,-34.5 + parent: 2 + type: Transform + - uid: 17627 + components: + - pos: 31.5,-34.5 + parent: 2 + type: Transform + - uid: 17628 + components: + - pos: 32.5,-34.5 + parent: 2 + type: Transform + - uid: 17629 + components: + - pos: 33.5,-34.5 + parent: 2 + type: Transform + - uid: 17630 + components: + - pos: 34.5,-34.5 + parent: 2 + type: Transform + - uid: 17631 + components: + - pos: 22.5,-37.5 + parent: 2 + type: Transform + - uid: 17632 + components: + - pos: 22.5,-38.5 + parent: 2 + type: Transform + - uid: 17633 + components: + - pos: 22.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17634 + components: + - pos: 23.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17635 + components: + - pos: 24.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17636 + components: + - pos: 25.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17638 + components: + - pos: 26.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17639 + components: + - pos: 27.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17640 + components: + - pos: 28.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17641 + components: + - pos: 29.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17642 + components: + - pos: 30.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17643 + components: + - pos: 31.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17644 + components: + - pos: 32.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17645 + components: + - pos: 33.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17646 + components: + - pos: 34.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17647 + components: + - pos: 35.5,-39.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 17648 + components: + - pos: 18.5,-43.5 + parent: 2 + type: Transform - uid: 17850 components: - pos: 50.5,-53.5 @@ -28490,7 +29140,7 @@ entities: type: AmbientSound - uid: 18045 components: - - pos: -12.5,37.5 + - pos: 18.5,-44.5 parent: 2 type: Transform - enabled: True @@ -28557,16 +29207,37 @@ entities: - pos: 6.5,32.5 parent: 2 type: Transform + - uid: 18163 + components: + - pos: 17.5,-44.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 18164 + components: + - pos: 19.5,-44.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 18217 components: - pos: 86.5,2.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18218 components: - pos: 80.5,1.5 parent: 2 type: Transform + - uid: 18219 + components: + - pos: 49.5,-19.5 + parent: 2 + type: Transform - uid: 18247 components: - pos: 76.5,4.5 @@ -28591,16 +29262,22 @@ entities: - pos: 86.5,0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18257 components: - pos: 82.5,-0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18258 components: - pos: 81.5,-0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18265 components: - pos: 79.5,1.5 @@ -28616,31 +29293,43 @@ entities: - pos: 86.5,1.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18271 components: - pos: 86.5,3.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18273 components: - pos: 84.5,4.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18274 components: - pos: 86.5,4.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18275 components: - pos: 85.5,4.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18276 components: - pos: 83.5,4.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18285 components: - pos: 38.5,-36.5 @@ -29186,6 +29875,8 @@ entities: - pos: 84.5,-0.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 18956 components: - pos: 79.5,4.5 @@ -29203,6 +29894,27 @@ entities: type: Transform - enabled: True type: AmbientSound + - uid: 18976 + components: + - pos: 49.5,-20.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 18977 + components: + - pos: 50.5,-20.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 18978 + components: + - pos: 51.5,-20.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - proto: CableApcStack entities: - uid: 3207 @@ -30640,8 +31352,6 @@ entities: - pos: 11.5,-19.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - uid: 3445 components: - pos: 11.5,-20.5 @@ -31651,8 +32361,6 @@ entities: - pos: 7.5,-30.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - uid: 3634 components: - pos: 7.5,-29.5 @@ -33573,727 +34281,178 @@ entities: - pos: -54.5,4.5 parent: 2 type: Transform - - uid: 12181 - components: - - pos: 38.5,-26.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 12346 - components: - - pos: -42.5,0.5 - parent: 2 - type: Transform - - uid: 12347 - components: - - pos: -43.5,0.5 - parent: 2 - type: Transform - - uid: 12686 - components: - - pos: -45.5,0.5 - parent: 2 - type: Transform - - uid: 12934 - components: - - pos: -47.5,0.5 - parent: 2 - type: Transform - - uid: 13133 - components: - - pos: -49.5,0.5 - parent: 2 - type: Transform - - uid: 13137 - components: - - pos: -51.5,0.5 - parent: 2 - type: Transform - - uid: 13144 - components: - - pos: -53.5,0.5 - parent: 2 - type: Transform - - uid: 13597 - components: - - pos: 1.5,-14.5 - parent: 2 - type: Transform - - uid: 14276 - components: - - pos: 1.5,-19.5 - parent: 2 - type: Transform - - uid: 17444 - components: - - pos: -7.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17540 - components: - - pos: 9.5,15.5 - parent: 2 - type: Transform - - uid: 17541 - components: - - pos: 8.5,15.5 - parent: 2 - type: Transform - - uid: 17542 - components: - - pos: 7.5,15.5 - parent: 2 - type: Transform - - uid: 17543 - components: - - pos: 6.5,15.5 - parent: 2 - type: Transform - - uid: 17544 - components: - - pos: 5.5,15.5 - parent: 2 - type: Transform - - uid: 17545 - components: - - pos: 5.5,16.5 - parent: 2 - type: Transform - - uid: 17546 - components: - - pos: 5.5,17.5 - parent: 2 - type: Transform - - uid: 17547 - components: - - pos: 6.5,17.5 - parent: 2 - type: Transform - - uid: 17548 - components: - - pos: 6.5,18.5 - parent: 2 - type: Transform - - uid: 17549 - components: - - pos: 6.5,19.5 - parent: 2 - type: Transform - - uid: 17550 - components: - - pos: 6.5,20.5 - parent: 2 - type: Transform - - uid: 17551 - components: - - pos: 6.5,21.5 - parent: 2 - type: Transform - - uid: 17552 - components: - - pos: 6.5,22.5 - parent: 2 - type: Transform - - uid: 17553 - components: - - pos: 6.5,23.5 - parent: 2 - type: Transform - - uid: 17554 - components: - - pos: 6.5,24.5 - parent: 2 - type: Transform - - uid: 17555 - components: - - pos: 5.5,24.5 - parent: 2 - type: Transform - - uid: 17556 - components: - - pos: 4.5,24.5 - parent: 2 - type: Transform - - uid: 17557 - components: - - pos: 3.5,24.5 - parent: 2 - type: Transform - - uid: 17558 - components: - - pos: 2.5,24.5 - parent: 2 - type: Transform - - uid: 17559 - components: - - pos: 1.5,24.5 - parent: 2 - type: Transform - - uid: 17560 - components: - - pos: 0.5,24.5 - parent: 2 - type: Transform - - uid: 17561 - components: - - pos: -0.5,24.5 - parent: 2 - type: Transform - - uid: 17562 - components: - - pos: -1.5,24.5 - parent: 2 - type: Transform - - uid: 17563 - components: - - pos: -1.5,25.5 - parent: 2 - type: Transform - - uid: 17564 - components: - - pos: -1.5,26.5 - parent: 2 - type: Transform - - uid: 17565 - components: - - pos: -1.5,27.5 - parent: 2 - type: Transform - - uid: 17566 - components: - - pos: -1.5,28.5 - parent: 2 - type: Transform - - uid: 17567 - components: - - pos: -1.5,29.5 - parent: 2 - type: Transform - - uid: 17568 - components: - - pos: -1.5,30.5 - parent: 2 - type: Transform - - uid: 17569 - components: - - pos: -2.5,30.5 - parent: 2 - type: Transform - - uid: 17570 - components: - - pos: -2.5,31.5 - parent: 2 - type: Transform - - uid: 17571 - components: - - pos: -2.5,32.5 - parent: 2 - type: Transform - - uid: 17572 - components: - - pos: -2.5,33.5 - parent: 2 - type: Transform - - uid: 17573 - components: - - pos: -2.5,34.5 - parent: 2 - type: Transform - - uid: 17574 - components: - - pos: -2.5,35.5 - parent: 2 - type: Transform - - uid: 17575 - components: - - pos: -3.5,35.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17576 - components: - - pos: -4.5,35.5 - parent: 2 - type: Transform - - uid: 17577 - components: - - pos: -4.5,36.5 - parent: 2 - type: Transform - - uid: 17578 - components: - - pos: -4.5,37.5 - parent: 2 - type: Transform - - uid: 17579 - components: - - pos: -4.5,38.5 - parent: 2 - type: Transform - - uid: 17580 - components: - - pos: -5.5,38.5 - parent: 2 - type: Transform - - uid: 17581 - components: - - pos: -6.5,38.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17582 - components: - - pos: -7.5,38.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17583 - components: - - pos: -8.5,38.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17584 - components: - - pos: -9.5,38.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17587 - components: - - pos: -13.5,41.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17588 - components: - - pos: -13.5,43.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17589 - components: - - pos: -13.5,42.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17590 - components: - - pos: -13.5,40.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17591 - components: - - pos: -13.5,39.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17592 - components: - - pos: -12.5,38.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17593 - components: - - pos: -13.5,38.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17594 - components: - - pos: -13.5,44.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17595 - components: - - pos: -13.5,45.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17596 - components: - - pos: -13.5,46.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17597 - components: - - pos: -13.5,47.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17598 - components: - - pos: -13.5,48.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17599 - components: - - pos: -13.5,49.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17600 - components: - - pos: -13.5,50.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17601 - components: - - pos: -13.5,51.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17602 - components: - - pos: -13.5,52.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17603 - components: - - pos: -13.5,53.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17604 - components: - - pos: -13.5,54.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17605 - components: - - pos: -12.5,54.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17606 - components: - - pos: -12.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17607 - components: - - pos: -11.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17608 - components: - - pos: -10.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17609 - components: - - pos: -9.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17610 - components: - - pos: -8.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17611 - components: - - pos: -6.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17612 - components: - - pos: -5.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17613 - components: - - pos: -4.5,55.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17614 + - uid: 12061 components: - - pos: -3.5,55.5 + - pos: -13.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17615 + - uid: 12071 components: - - pos: -2.5,55.5 + - pos: 3.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17616 + - uid: 12076 components: - - pos: -1.5,55.5 + - pos: -11.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17617 + - uid: 12078 components: - - pos: -0.5,55.5 + - pos: -12.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17618 + - uid: 12079 components: - - pos: 1.5,55.5 + - pos: -10.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17619 + - uid: 12083 components: - - pos: 0.5,55.5 + - pos: -9.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17620 + - uid: 12097 components: - - pos: 2.5,55.5 + - pos: -8.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17621 + - uid: 12100 components: - - pos: 3.5,55.5 + - pos: -7.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17622 + - uid: 12102 components: - - pos: 4.5,55.5 + - pos: -5.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17623 + - uid: 12104 components: - - pos: 5.5,55.5 + - pos: -6.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17624 + - uid: 12106 components: - - pos: 6.5,55.5 + - pos: -4.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17625 + - uid: 12127 components: - - pos: 7.5,55.5 + - pos: -3.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17626 + - uid: 12129 components: - - pos: 8.5,55.5 + - pos: -2.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17627 + - uid: 12131 components: - - pos: 8.5,54.5 + - pos: -1.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17628 + - uid: 12132 components: - - pos: 9.5,54.5 + - pos: -0.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17629 + - uid: 12134 components: - - pos: 9.5,53.5 + - pos: 0.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17630 + - uid: 12136 components: - - pos: 9.5,52.5 + - pos: 4.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17631 + - uid: 12139 components: - - pos: 9.5,51.5 + - pos: 2.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17632 + - uid: 12181 components: - - pos: 9.5,50.5 + - pos: 38.5,-26.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 17633 + - uid: 12208 components: - - pos: 9.5,49.5 + - pos: 1.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17634 + - uid: 12346 components: - - pos: 9.5,48.5 + - pos: -42.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17635 + - uid: 12347 components: - - pos: 9.5,47.5 + - pos: -43.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17636 + - uid: 12686 components: - - pos: 9.5,46.5 + - pos: -45.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17638 + - uid: 12934 components: - - pos: 9.5,45.5 + - pos: -47.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17639 + - uid: 13133 components: - - pos: 9.5,44.5 + - pos: -49.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17640 + - uid: 13137 components: - - pos: 9.5,43.5 + - pos: -51.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17641 + - uid: 13144 components: - - pos: 9.5,42.5 + - pos: -53.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17642 + - uid: 13597 components: - - pos: 9.5,40.5 + - pos: 1.5,-14.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17643 + - uid: 14276 components: - - pos: 9.5,41.5 + - pos: 1.5,-19.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17644 + - uid: 17540 components: - - pos: 9.5,39.5 + - pos: 9.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17645 + - uid: 17541 components: - - pos: 9.5,38.5 + - pos: 8.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17646 + - uid: 17542 components: - - pos: 9.5,37.5 + - pos: 7.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17647 + - uid: 17543 components: - - pos: 9.5,36.5 + - pos: 6.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 17648 + - uid: 17544 components: - - pos: 9.5,35.5 + - pos: 5.5,15.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - uid: 17673 components: - pos: 44.5,-52.5 @@ -34480,20 +34639,6 @@ entities: - pos: 25.5,-20.5 parent: 2 type: Transform - - uid: 18163 - components: - - pos: 9.5,33.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 18164 - components: - - pos: 9.5,32.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - uid: 18297 components: - pos: 75.5,1.5 @@ -34528,6 +34673,60 @@ entities: type: Transform - proto: CableMV entities: + - uid: 498 + components: + - pos: 60.5,-19.5 + parent: 2 + type: Transform + - uid: 499 + components: + - pos: 61.5,-9.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 500 + components: + - pos: 60.5,-9.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 501 + components: + - pos: 60.5,-10.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 502 + components: + - pos: 59.5,-20.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 503 + components: + - pos: 60.5,-20.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 505 + components: + - pos: 55.5,-22.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound + - uid: 506 + components: + - pos: 55.5,-20.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 3135 components: - pos: -18.5,29.5 @@ -35783,6 +35982,11 @@ entities: - pos: -19.5,29.5 parent: 2 type: Transform + - uid: 4193 + components: + - pos: 55.5,-21.5 + parent: 2 + type: Transform - uid: 4194 components: - pos: -13.5,29.5 @@ -36773,8 +36977,6 @@ entities: - pos: 7.5,-30.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - uid: 4378 components: - pos: 8.5,-31.5 @@ -38645,6 +38847,13 @@ entities: - pos: 38.5,-20.5 parent: 2 type: Transform + - uid: 6249 + components: + - pos: 58.5,-20.5 + parent: 2 + type: Transform + - enabled: True + type: AmbientSound - uid: 12985 components: - pos: 50.5,-26.5 @@ -38667,1062 +38876,581 @@ entities: - pos: 54.5,15.5 parent: 2 type: Transform - - uid: 17198 - components: - - pos: 54.5,16.5 - parent: 2 - type: Transform - - uid: 17199 - components: - - pos: 54.5,17.5 - parent: 2 - type: Transform - - uid: 17200 - components: - - pos: 54.5,18.5 - parent: 2 - type: Transform - - uid: 17201 - components: - - pos: 53.5,18.5 - parent: 2 - type: Transform - - uid: 17202 - components: - - pos: 52.5,18.5 - parent: 2 - type: Transform - - uid: 17203 - components: - - pos: 51.5,18.5 - parent: 2 - type: Transform - - uid: 17204 - components: - - pos: 50.5,18.5 - parent: 2 - type: Transform - - uid: 17205 - components: - - pos: 49.5,18.5 - parent: 2 - type: Transform - - uid: 17206 - components: - - pos: 48.5,18.5 - parent: 2 - type: Transform - - uid: 17207 - components: - - pos: 47.5,18.5 - parent: 2 - type: Transform - - uid: 17208 - components: - - pos: 46.5,18.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17209 - components: - - pos: 45.5,18.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17210 - components: - - pos: 45.5,19.5 - parent: 2 - type: Transform - - uid: 17211 - components: - - pos: 45.5,20.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17212 - components: - - pos: 45.5,21.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17213 - components: - - pos: 45.5,22.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17214 - components: - - pos: 45.5,23.5 - parent: 2 - type: Transform - - uid: 17215 - components: - - pos: 46.5,23.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17216 - components: - - pos: 47.5,23.5 - parent: 2 - type: Transform - - uid: 17217 - components: - - pos: 48.5,23.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17218 - components: - - pos: 49.5,23.5 - parent: 2 - type: Transform - - uid: 17219 - components: - - pos: 50.5,23.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17220 - components: - - pos: 51.5,23.5 - parent: 2 - type: Transform - - uid: 17221 - components: - - pos: 52.5,23.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17222 - components: - - pos: 53.5,23.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17223 - components: - - pos: 54.5,23.5 - parent: 2 - type: Transform - - uid: 17224 - components: - - pos: 55.5,23.5 - parent: 2 - type: Transform - - uid: 17225 - components: - - pos: 56.5,23.5 - parent: 2 - type: Transform - - uid: 17226 - components: - - pos: 57.5,23.5 - parent: 2 - type: Transform - - uid: 17227 - components: - - pos: 58.5,23.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17228 - components: - - pos: 58.5,24.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17229 - components: - - pos: 54.5,3.5 - parent: 2 - type: Transform - - uid: 17230 - components: - - pos: 54.5,2.5 - parent: 2 - type: Transform - - uid: 17231 - components: - - pos: 55.5,2.5 - parent: 2 - type: Transform - - uid: 17232 - components: - - pos: 56.5,2.5 - parent: 2 - type: Transform - - uid: 17233 - components: - - pos: 57.5,2.5 - parent: 2 - type: Transform - - uid: 17234 - components: - - pos: 58.5,2.5 - parent: 2 - type: Transform - - uid: 17235 - components: - - pos: 59.5,2.5 - parent: 2 - type: Transform - - uid: 17236 - components: - - pos: 60.5,2.5 - parent: 2 - type: Transform - - uid: 17237 - components: - - pos: 61.5,2.5 - parent: 2 - type: Transform - - uid: 17238 - components: - - pos: 62.5,2.5 - parent: 2 - type: Transform - - uid: 17239 - components: - - pos: 63.5,2.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17240 - components: - - pos: 63.5,3.5 - parent: 2 - type: Transform - - uid: 17241 - components: - - pos: 63.5,4.5 - parent: 2 - type: Transform - - uid: 17242 - components: - - pos: 64.5,4.5 - parent: 2 - type: Transform - - uid: 17243 - components: - - pos: 65.5,4.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17244 - components: - - pos: 66.5,4.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17245 - components: - - pos: 67.5,4.5 - parent: 2 - type: Transform - - uid: 17246 - components: - - pos: 67.5,3.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17247 - components: - - pos: 67.5,2.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17248 - components: - - pos: 68.5,2.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17249 - components: - - pos: 69.5,2.5 - parent: 2 - type: Transform - - uid: 17250 - components: - - pos: 70.5,2.5 - parent: 2 - type: Transform - - uid: 17251 - components: - - pos: 70.5,3.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17252 - components: - - pos: 70.5,4.5 - parent: 2 - type: Transform - - uid: 17253 - components: - - pos: 70.5,5.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17254 - components: - - pos: 71.5,5.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17255 - components: - - pos: 72.5,5.5 - parent: 2 - type: Transform - - uid: 17256 - components: - - pos: 73.5,5.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17257 - components: - - pos: 75.5,10.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17258 - components: - - pos: 75.5,9.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17259 - components: - - pos: 75.5,8.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17260 - components: - - pos: 75.5,7.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17261 - components: - - pos: 75.5,6.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17262 - components: - - pos: 75.5,5.5 - parent: 2 - type: Transform - - uid: 17263 - components: - - pos: 74.5,5.5 - parent: 2 - type: Transform - - uid: 17585 - components: - - pos: -7.5,26.5 - parent: 2 - type: Transform - - uid: 17586 - components: - - pos: -11.5,38.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 17874 - components: - - pos: 44.5,-53.5 - parent: 2 - type: Transform - - uid: 17875 - components: - - pos: 44.5,-54.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 18001 - components: - - pos: 15.5,-39.5 - parent: 2 - type: Transform - - enabled: True - type: AmbientSound - - uid: 18004 + - uid: 17198 components: - - pos: 15.5,-38.5 + - pos: 54.5,16.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18069 + - uid: 17199 components: - - pos: 50.5,-25.5 + - pos: 54.5,17.5 parent: 2 type: Transform - - uid: 18070 + - uid: 17200 components: - - pos: 51.5,-25.5 + - pos: 54.5,18.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18071 + - uid: 17201 components: - - pos: 52.5,-25.5 + - pos: 53.5,18.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18072 + - uid: 17202 components: - - pos: 53.5,-25.5 + - pos: 52.5,18.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18073 + - uid: 17203 components: - - pos: 54.5,-25.5 + - pos: 51.5,18.5 parent: 2 type: Transform - - uid: 18259 + - uid: 17204 components: - - pos: 75.5,0.5 + - pos: 50.5,18.5 parent: 2 type: Transform - - uid: 18260 + - uid: 17205 components: - - pos: 76.5,0.5 + - pos: 49.5,18.5 parent: 2 type: Transform - - uid: 18261 + - uid: 17206 components: - - pos: 76.5,1.5 + - pos: 48.5,18.5 parent: 2 type: Transform - - uid: 18262 + - uid: 17207 components: - - pos: 77.5,1.5 + - pos: 47.5,18.5 parent: 2 type: Transform - - uid: 18263 + - uid: 17208 components: - - pos: 77.5,2.5 + - pos: 46.5,18.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 18266 + - uid: 17209 components: - - pos: 75.5,0.5 + - pos: 45.5,18.5 parent: 2 type: Transform - - uid: 18674 - components: - - pos: 6.5,-5.5 - parent: 18594 - type: Transform - - uid: 18675 + - enabled: True + type: AmbientSound + - uid: 17210 components: - - pos: 5.5,-5.5 - parent: 18594 + - pos: 45.5,19.5 + parent: 2 type: Transform - - uid: 18676 + - uid: 17211 components: - - pos: 4.5,-5.5 - parent: 18594 + - pos: 45.5,20.5 + parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 18743 + - uid: 17212 components: - - pos: -17.5,29.5 + - pos: 45.5,21.5 parent: 2 type: Transform - - uid: 18824 + - enabled: True + type: AmbientSound + - uid: 17213 components: - - pos: -16.5,29.5 + - pos: 45.5,22.5 parent: 2 type: Transform - - uid: 18906 + - enabled: True + type: AmbientSound + - uid: 17214 components: - - pos: -15.5,29.5 + - pos: 45.5,23.5 parent: 2 type: Transform - - uid: 18963 + - uid: 17215 components: - - pos: -14.5,29.5 + - pos: 46.5,23.5 parent: 2 type: Transform - - uid: 18979 + - enabled: True + type: AmbientSound + - uid: 17216 components: - - pos: -7.5,27.5 + - pos: 47.5,23.5 parent: 2 type: Transform - - uid: 18980 + - uid: 17217 components: - - pos: -7.5,28.5 + - pos: 48.5,23.5 parent: 2 type: Transform - - uid: 18981 + - enabled: True + type: AmbientSound + - uid: 17218 components: - - pos: -7.5,29.5 + - pos: 49.5,23.5 parent: 2 type: Transform - - uid: 18982 + - uid: 17219 components: - - pos: -7.5,30.5 + - pos: 50.5,23.5 parent: 2 type: Transform - - uid: 18983 + - enabled: True + type: AmbientSound + - uid: 17220 components: - - pos: -7.5,31.5 + - pos: 51.5,23.5 parent: 2 type: Transform - - uid: 18984 + - uid: 17221 components: - - pos: -7.5,32.5 + - pos: 52.5,23.5 parent: 2 type: Transform - - uid: 18985 + - enabled: True + type: AmbientSound + - uid: 17222 components: - - pos: -7.5,33.5 + - pos: 53.5,23.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 18986 + - uid: 17223 components: - - pos: -7.5,34.5 + - pos: 54.5,23.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18987 + - uid: 17224 components: - - pos: -7.5,35.5 + - pos: 55.5,23.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18988 + - uid: 17225 components: - - pos: -8.5,35.5 + - pos: 56.5,23.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18989 + - uid: 17226 components: - - pos: -9.5,35.5 + - pos: 57.5,23.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18990 + - uid: 17227 components: - - pos: -10.5,35.5 + - pos: 58.5,23.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 18991 + - uid: 17228 components: - - pos: -10.5,36.5 + - pos: 58.5,24.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 18992 + - uid: 17229 components: - - pos: -10.5,37.5 + - pos: 54.5,3.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18993 + - uid: 17230 components: - - pos: -10.5,38.5 + - pos: 54.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18994 + - uid: 17231 components: - - pos: -12.5,38.5 + - pos: 55.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18995 + - uid: 17232 components: - - pos: -13.5,38.5 + - pos: 56.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18996 + - uid: 17233 components: - - pos: -13.5,39.5 + - pos: 57.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18997 + - uid: 17234 components: - - pos: -13.5,40.5 + - pos: 58.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18998 + - uid: 17235 components: - - pos: -13.5,41.5 + - pos: 59.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 18999 + - uid: 17236 components: - - pos: -13.5,42.5 + - pos: 60.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19000 + - uid: 17237 components: - - pos: -13.5,43.5 + - pos: 61.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19001 + - uid: 17238 components: - - pos: -13.5,44.5 + - pos: 62.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19002 + - uid: 17239 components: - - pos: -13.5,45.5 + - pos: 63.5,2.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19003 + - uid: 17240 components: - - pos: -13.5,46.5 + - pos: 63.5,3.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19004 + - uid: 17241 components: - - pos: -13.5,47.5 + - pos: 63.5,4.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19005 + - uid: 17242 components: - - pos: -13.5,48.5 + - pos: 64.5,4.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19006 + - uid: 17243 components: - - pos: -13.5,49.5 + - pos: 65.5,4.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19007 + - uid: 17244 components: - - pos: -13.5,50.5 + - pos: 66.5,4.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19008 + - uid: 17245 components: - - pos: -13.5,51.5 + - pos: 67.5,4.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19009 + - uid: 17246 components: - - pos: -13.5,52.5 + - pos: 67.5,3.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19010 + - uid: 17247 components: - - pos: -13.5,53.5 + - pos: 67.5,2.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19011 + - uid: 17248 components: - - pos: -13.5,54.5 + - pos: 68.5,2.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19012 + - uid: 17249 components: - - pos: -12.5,54.5 + - pos: 69.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19013 + - uid: 17250 components: - - pos: -12.5,55.5 + - pos: 70.5,2.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19014 + - uid: 17251 components: - - pos: -11.5,55.5 + - pos: 70.5,3.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19015 + - uid: 17252 components: - - pos: -10.5,55.5 + - pos: 70.5,4.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19016 + - uid: 17253 components: - - pos: -9.5,55.5 + - pos: 70.5,5.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19017 + - uid: 17254 components: - - pos: -8.5,55.5 + - pos: 71.5,5.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19018 + - uid: 17255 components: - - pos: -7.5,55.5 + - pos: 72.5,5.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19019 + - uid: 17256 components: - - pos: -6.5,55.5 + - pos: 73.5,5.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19020 + - uid: 17257 components: - - pos: -5.5,55.5 + - pos: 75.5,10.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19021 + - uid: 17258 components: - - pos: -4.5,55.5 + - pos: 75.5,9.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19022 + - uid: 17259 components: - - pos: -3.5,55.5 + - pos: 75.5,8.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19023 + - uid: 17260 components: - - pos: -2.5,55.5 + - pos: 75.5,7.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19024 + - uid: 17261 components: - - pos: -1.5,55.5 + - pos: 75.5,6.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19025 + - uid: 17262 components: - - pos: -0.5,55.5 + - pos: 75.5,5.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19026 + - uid: 17263 components: - - pos: 0.5,55.5 + - pos: 74.5,5.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19027 + - uid: 17573 components: - - pos: 1.5,55.5 + - pos: 56.5,-20.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19028 + - uid: 17594 components: - - pos: 2.5,55.5 + - pos: 57.5,-20.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19029 + - uid: 17606 components: - - pos: 3.5,55.5 + - pos: 60.5,-11.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19030 + - uid: 17607 components: - - pos: 4.5,55.5 + - pos: 60.5,-12.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19031 + - uid: 17608 components: - - pos: 5.5,55.5 + - pos: 60.5,-13.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19032 + - uid: 17609 components: - - pos: 6.5,55.5 + - pos: 60.5,-14.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19033 + - uid: 17610 components: - - pos: 7.5,55.5 + - pos: 60.5,-15.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19034 + - uid: 17611 components: - - pos: 8.5,55.5 + - pos: 60.5,-16.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19035 + - uid: 17612 components: - - pos: 8.5,54.5 + - pos: 60.5,-17.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19036 + - uid: 17613 components: - - pos: 9.5,54.5 + - pos: 60.5,-18.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19037 + - uid: 17614 components: - - pos: 9.5,53.5 + - pos: 60.5,-19.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19038 + - uid: 17874 components: - - pos: 9.5,52.5 + - pos: 44.5,-53.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19039 + - uid: 17875 components: - - pos: 9.5,51.5 + - pos: 44.5,-54.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19040 + - uid: 18001 components: - - pos: 9.5,50.5 + - pos: 15.5,-39.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19041 + - uid: 18004 components: - - pos: 9.5,49.5 + - pos: 15.5,-38.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19042 + - uid: 18069 components: - - pos: 9.5,48.5 + - pos: 50.5,-25.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19043 + - uid: 18070 components: - - pos: 9.5,47.5 + - pos: 51.5,-25.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19044 + - uid: 18071 components: - - pos: 9.5,46.5 + - pos: 52.5,-25.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19045 + - uid: 18072 components: - - pos: 9.5,45.5 + - pos: 53.5,-25.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19046 + - uid: 18073 components: - - pos: 9.5,44.5 + - pos: 54.5,-25.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19047 + - uid: 18259 components: - - pos: 9.5,43.5 + - pos: 75.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19048 + - uid: 18260 components: - - pos: 9.5,42.5 + - pos: 76.5,0.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19049 + - uid: 18261 components: - - pos: 9.5,41.5 + - pos: 76.5,1.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19050 + - uid: 18262 components: - - pos: 9.5,40.5 + - pos: 77.5,1.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19051 + - uid: 18263 components: - - pos: 9.5,39.5 + - pos: 77.5,2.5 parent: 2 type: Transform - enabled: True type: AmbientSound - - uid: 19052 + - uid: 18266 components: - - pos: 9.5,38.5 + - pos: 75.5,0.5 parent: 2 type: Transform + - uid: 18674 + components: + - pos: 6.5,-5.5 + parent: 18594 + type: Transform + - uid: 18675 + components: + - pos: 5.5,-5.5 + parent: 18594 + type: Transform + - uid: 18676 + components: + - pos: 4.5,-5.5 + parent: 18594 + type: Transform - enabled: True type: AmbientSound - - uid: 19053 + - uid: 18743 components: - - pos: 9.5,37.5 + - pos: -17.5,29.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19054 + - uid: 18824 components: - - pos: 9.5,36.5 + - pos: -16.5,29.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19055 + - uid: 18906 components: - - pos: 9.5,34.5 + - pos: -15.5,29.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - - uid: 19056 + - uid: 18963 components: - - pos: 9.5,33.5 + - pos: -14.5,29.5 parent: 2 type: Transform - - enabled: True - type: AmbientSound - proto: CableMVStack entities: - uid: 4724 @@ -45913,6 +45641,18 @@ entities: pos: 8.5,-25.5 parent: 2 type: Transform + - uid: 17587 + components: + - rot: -1.5707963267948966 rad + pos: 13.5,-10.5 + parent: 2 + type: Transform + - uid: 17590 + components: + - rot: -1.5707963267948966 rad + pos: 13.5,-9.5 + parent: 2 + type: Transform - uid: 17867 components: - rot: -1.5707963267948966 rad @@ -47452,6 +47192,13 @@ entities: - pos: -4.5070887,38.618988 parent: 2 type: Transform +- proto: ClothingHeadHatAnimalHeadslime + entities: + - uid: 17571 + components: + - pos: 68.371056,17.693415 + parent: 2 + type: Transform - proto: ClothingHeadHatBeret entities: - uid: 5907 @@ -47997,13 +47744,6 @@ entities: - pos: 82.28962,6.402648 parent: 2 type: Transform -- proto: ClothingMaskGasCentcom - entities: - - uid: 17473 - components: - - pos: 6.41812,48.68449 - parent: 2 - type: Transform - proto: ClothingNeckBling entities: - uid: 6086 @@ -49086,6 +48826,13 @@ entities: pos: 33.5,-25.5 parent: 2 type: Transform +- proto: ComputerMassMedia + entities: + - uid: 17578 + components: + - pos: -49.5,-28.5 + parent: 2 + type: Transform - proto: ComputerMedicalRecords entities: - uid: 5491 @@ -49506,9 +49253,9 @@ entities: type: Transform - proto: CrateEngineeringAMEJar entities: - - uid: 6229 + - uid: 17595 components: - - pos: 9.5,-20.5 + - pos: 14.5,-20.5 parent: 2 type: Transform - proto: CrateEngineeringCableBulk @@ -49657,50 +49404,6 @@ entities: - pos: 26.5,-35.5 parent: 2 type: Transform -- proto: CrateSecure - entities: - - uid: 6249 - components: - - pos: 6.5,-39.5 - parent: 2 - type: Transform - - air: - volume: 200 - immutable: False - temperature: 293.14972 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - type: EntityStorage - - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 10129 - - 6250 - - 6251 - - 6252 - - 6254 - - 6255 - - 6253 - - 6256 - - 6257 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - type: ContainerContainer - proto: CrateServiceJanitorialSupplies entities: - uid: 6258 @@ -50009,11 +49712,6 @@ entities: type: Transform - proto: DiceBag entities: - - uid: 6298 - components: - - pos: -17.544281,-13.323898 - parent: 2 - type: Transform - uid: 6299 components: - pos: -33.39842,-75.49728 @@ -50024,6 +49722,11 @@ entities: - pos: 68.28807,0.72848344 parent: 2 type: Transform + - uid: 18984 + components: + - pos: -19.372366,-13.330626 + parent: 2 + type: Transform - proto: DiseaseDiagnoser entities: - uid: 6301 @@ -55601,26 +55304,16 @@ entities: type: Transform - proto: EncryptionKeyCargo entities: - - uid: 6250 + - uid: 17582 components: - flags: InContainer type: MetaData - - parent: 6249 + - parent: 14028 type: Transform - canCollide: False type: Physics - - type: InsideEntityStorage - proto: EncryptionKeyCommand entities: - - uid: 6251 - components: - - flags: InContainer - type: MetaData - - parent: 6249 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - uid: 15894 components: - flags: InContainer @@ -55629,17 +55322,16 @@ entities: type: Transform - canCollide: False type: Physics -- proto: EncryptionKeyCommon - entities: - - uid: 6252 + - uid: 17583 components: - flags: InContainer type: MetaData - - parent: 6249 + - parent: 14029 type: Transform - canCollide: False type: Physics - - type: InsideEntityStorage +- proto: EncryptionKeyCommon + entities: - uid: 17538 components: - pos: 1.3200953,-38.408688 @@ -55650,6 +55342,14 @@ entities: - pos: 1.4546318,-38.506535 parent: 2 type: Transform + - uid: 17585 + components: + - flags: InContainer + type: MetaData + - parent: 14031 + type: Transform + - canCollide: False + type: Physics - uid: 18420 components: - pos: 1.601399,-38.592148 @@ -55657,59 +55357,54 @@ entities: type: Transform - proto: EncryptionKeyEngineering entities: - - uid: 6253 + - uid: 17581 components: - flags: InContainer type: MetaData - - parent: 6249 + - parent: 14027 type: Transform - canCollide: False type: Physics - - type: InsideEntityStorage - proto: EncryptionKeyMedical entities: - - uid: 6254 + - uid: 17584 components: - flags: InContainer type: MetaData - - parent: 6249 + - parent: 14030 type: Transform - canCollide: False type: Physics - - type: InsideEntityStorage - proto: EncryptionKeyScience entities: - - uid: 6255 + - uid: 17579 components: - flags: InContainer type: MetaData - - parent: 6249 + - parent: 14025 type: Transform - canCollide: False type: Physics - - type: InsideEntityStorage - proto: EncryptionKeySecurity entities: - - uid: 6256 + - uid: 17580 components: - flags: InContainer type: MetaData - - parent: 6249 + - parent: 14026 type: Transform - canCollide: False type: Physics - - type: InsideEntityStorage - proto: EncryptionKeyService entities: - - uid: 6257 + - uid: 17586 components: - flags: InContainer type: MetaData - - parent: 6249 + - parent: 14032 type: Transform - canCollide: False type: Physics - - type: InsideEntityStorage - proto: EuphoniumInstrument entities: - uid: 18026 @@ -55974,6 +55669,14 @@ entities: type: Transform - name: Atmospherics type: FaxMachine + - uid: 17509 + components: + - pos: -17.5,-13.5 + parent: 2 + type: Transform + - destinationAddress: Library + name: Library + type: FaxMachine - proto: FaxMachineCaptain entities: - uid: 7233 @@ -56432,19 +56135,6 @@ entities: - 7522 - 7353 type: DeviceList - - uid: 7259 - components: - - pos: 22.5,-10.5 - parent: 2 - type: Transform - - ShutdownSubscribers: - - 460 - type: DeviceNetwork - - devices: - - 7329 - - 7470 - - 460 - type: DeviceList - uid: 7260 components: - pos: 52.5,-9.5 @@ -57477,6 +57167,19 @@ entities: - 433 - 7564 type: DeviceList + - uid: 17545 + components: + - pos: 22.5,-10.5 + parent: 2 + type: Transform + - ShutdownSubscribers: + - 7313 + - 7663 + type: DeviceNetwork + - devices: + - 7313 + - 7663 + type: DeviceList - proto: FireAxeCabinetFilled entities: - uid: 7311 @@ -57506,6 +57209,8 @@ entities: type: Transform - ShutdownSubscribers: - 47 + - 17545 + - 50 type: DeviceNetwork - uid: 7314 components: @@ -58973,14 +58678,6 @@ entities: - 49 - 7297 type: DeviceNetwork - - uid: 7470 - components: - - pos: 14.5,-9.5 - parent: 2 - type: Transform - - ShutdownSubscribers: - - 50 - type: DeviceNetwork - uid: 7471 components: - pos: 24.5,-16.5 @@ -60670,6 +60367,10 @@ entities: pos: 13.5,-3.5 parent: 2 type: Transform + - ShutdownSubscribers: + - 17545 + - 50 + type: DeviceNetwork - uid: 7664 components: - rot: 3.141592653589793 rad @@ -61524,6 +61225,13 @@ entities: pos: 1.7533798,-2.530117 parent: 18594 type: Transform +- proto: FoodBoxDonut + entities: + - uid: 6250 + components: + - pos: 6.487894,-38.339687 + parent: 2 + type: Transform - proto: FoodBreadMoldySlice entities: - uid: 7739 @@ -61926,6 +61634,8 @@ entities: pos: 13.5,-6.5 parent: 2 type: Transform + - enabled: True + type: AmbientSound - uid: 7785 components: - pos: 19.5,-7.5 @@ -62241,6 +61951,8 @@ entities: type: Transform - color: '#0335FCFF' type: AtmosPipeColor + - enabled: True + type: AmbientSound - uid: 7825 components: - rot: 1.5707963267948966 rad @@ -65170,8 +64882,6 @@ entities: type: Transform - color: '#FF1212FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 8194 components: - pos: 12.5,-11.5 @@ -65451,8 +65161,6 @@ entities: type: Transform - color: '#FF1212FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 8229 components: - rot: 1.5707963267948966 rad @@ -83846,6 +83554,26 @@ entities: - pos: 47.5,2.5 parent: 2 type: Transform + - uid: 6252 + components: + - pos: -3.5,55.5 + parent: 2 + type: Transform + - uid: 6298 + components: + - pos: -13.5,50.5 + parent: 2 + type: Transform + - uid: 7259 + components: + - pos: -13.5,47.5 + parent: 2 + type: Transform + - uid: 7470 + components: + - pos: -13.5,44.5 + parent: 2 + type: Transform - uid: 10426 components: - pos: 54.5,-19.5 @@ -86934,6 +86662,11 @@ entities: - pos: 77.5,24.5 parent: 2 type: Transform + - uid: 11127 + components: + - pos: -11.5,55.5 + parent: 2 + type: Transform - uid: 11269 components: - rot: 1.5707963267948966 rad @@ -86951,6 +86684,26 @@ entities: pos: 44.5,4.5 parent: 2 type: Transform + - uid: 11697 + components: + - pos: -9.5,55.5 + parent: 2 + type: Transform + - uid: 11711 + components: + - pos: -5.5,55.5 + parent: 2 + type: Transform + - uid: 11847 + components: + - pos: 0.5,55.5 + parent: 2 + type: Transform + - uid: 11848 + components: + - pos: 1.5,55.5 + parent: 2 + type: Transform - uid: 12220 components: - pos: 44.5,1.5 @@ -86978,6 +86731,16 @@ entities: - pos: 8.5,34.5 parent: 2 type: Transform + - uid: 14237 + components: + - pos: -13.5,51.5 + parent: 2 + type: Transform + - uid: 14238 + components: + - pos: -13.5,48.5 + parent: 2 + type: Transform - uid: 14265 components: - pos: -2.5,-18.5 @@ -87213,6 +86976,11 @@ entities: pos: 54.5,26.5 parent: 2 type: Transform + - uid: 17117 + components: + - pos: -13.5,45.5 + parent: 2 + type: Transform - uid: 17183 components: - pos: 72.5,23.5 @@ -87228,122 +86996,32 @@ entities: - pos: 72.5,32.5 parent: 2 type: Transform - - uid: 17484 + - uid: 17473 components: - pos: -13.5,53.5 parent: 2 type: Transform - - uid: 17486 - components: - - pos: -13.5,51.5 - parent: 2 - type: Transform - - uid: 17487 - components: - - pos: -13.5,50.5 - parent: 2 - type: Transform - - uid: 17488 - components: - - pos: -13.5,49.5 - parent: 2 - type: Transform - - uid: 17489 - components: - - pos: -13.5,48.5 - parent: 2 - type: Transform - uid: 17490 - components: - - pos: -13.5,47.5 - parent: 2 - type: Transform - - uid: 17491 - components: - - pos: -13.5,46.5 - parent: 2 - type: Transform - - uid: 17492 - components: - - pos: -13.5,45.5 - parent: 2 - type: Transform - - uid: 17493 - components: - - pos: -13.5,44.5 - parent: 2 - type: Transform - - uid: 17494 - components: - - pos: -11.5,55.5 - parent: 2 - type: Transform - - uid: 17496 - components: - - pos: -9.5,55.5 - parent: 2 - type: Transform - - uid: 17497 components: - pos: -8.5,55.5 parent: 2 type: Transform - - uid: 17498 - components: - - pos: -7.5,55.5 - parent: 2 - type: Transform - - uid: 17499 + - uid: 17491 components: - pos: -6.5,55.5 parent: 2 type: Transform - - uid: 17500 - components: - - pos: -5.5,55.5 - parent: 2 - type: Transform - - uid: 17501 - components: - - pos: -4.5,55.5 - parent: 2 - type: Transform - - uid: 17502 - components: - - pos: -3.5,55.5 - parent: 2 - type: Transform - - uid: 17503 + - uid: 17492 components: - pos: -2.5,55.5 parent: 2 type: Transform - - uid: 17504 + - uid: 17493 components: - pos: -0.5,55.5 parent: 2 type: Transform - - uid: 17505 - components: - - pos: -1.5,55.5 - parent: 2 - type: Transform - - uid: 17506 - components: - - pos: 0.5,55.5 - parent: 2 - type: Transform - - uid: 17507 - components: - - pos: 2.5,55.5 - parent: 2 - type: Transform - - uid: 17508 - components: - - pos: 1.5,55.5 - parent: 2 - type: Transform - - uid: 17509 + - uid: 17494 components: - pos: 3.5,55.5 parent: 2 @@ -87428,6 +87106,41 @@ entities: - pos: -13.5,42.5 parent: 2 type: Transform + - uid: 17548 + components: + - pos: -13.5,46.5 + parent: 2 + type: Transform + - uid: 17549 + components: + - pos: -13.5,49.5 + parent: 2 + type: Transform + - uid: 17557 + components: + - pos: -7.5,55.5 + parent: 2 + type: Transform + - uid: 17558 + components: + - pos: -4.5,55.5 + parent: 2 + type: Transform + - uid: 17559 + components: + - pos: -1.5,55.5 + parent: 2 + type: Transform + - uid: 17560 + components: + - pos: 2.5,55.5 + parent: 2 + type: Transform + - uid: 17572 + components: + - pos: -35.5,-36.5 + parent: 2 + type: Transform - uid: 17827 components: - pos: 56.5,-56.5 @@ -88918,7 +88631,7 @@ entities: - pos: 44.5,7.5 parent: 2 type: Transform - - SecondsUntilStateChange: -12737.242 + - SecondsUntilStateChange: -15037.545 state: Opening type: Door - uid: 11091 @@ -88926,7 +88639,7 @@ entities: - pos: 62.5,21.5 parent: 2 type: Transform - - SecondsUntilStateChange: -152487.81 + - SecondsUntilStateChange: -154788.11 state: Opening type: Door - uid: 11092 @@ -89085,6 +88798,21 @@ entities: - pos: 45.5,-51.5 parent: 2 type: Transform + - uid: 18985 + components: + - pos: -30.5,-10.5 + parent: 2 + type: Transform + - uid: 18986 + components: + - pos: -34.5,-10.5 + parent: 2 + type: Transform + - uid: 18987 + components: + - pos: -38.5,-10.5 + parent: 2 + type: Transform - proto: hydroponicsSoil entities: - uid: 11122 @@ -89136,11 +88864,6 @@ entities: type: Transform - proto: HydroponicsToolHatchet entities: - - uid: 11127 - components: - - pos: -7.4559517,49.685402 - parent: 2 - type: Transform - uid: 11128 components: - pos: -30.593403,13.651833 @@ -89175,11 +88898,6 @@ entities: type: Transform - proto: HydroponicsToolScythe entities: - - uid: 11131 - components: - - pos: -7.4421177,50.45011 - parent: 2 - type: Transform - uid: 11132 components: - pos: -29.543404,13.633083 @@ -90773,6 +90491,11 @@ entities: - pos: 54.838127,21.551985 parent: 2 type: Transform + - uid: 17577 + components: + - pos: 27.506649,-34.416996 + parent: 2 + type: Transform - proto: MedkitOxygenFilled entities: - uid: 11305 @@ -91447,39 +91170,6 @@ entities: - pos: -42.5013,14.566595 parent: 2 type: Transform - - uid: 11394 - components: - - pos: 4.451738,-38.38852 - parent: 2 - type: Transform - - stampState: paper_stamp-centcom - stampedBy: - - CentCom - content: >- - Dear Chief Engineer, - - - The encryption keys need to be sorted out to their respective servers. - - It is critical that you do this soon. - - - Best wishes, CentCom. - type: Paper - - uid: 11395 - components: - - pos: 58.480293,4.6848125 - parent: 2 - type: Transform - - stampState: paper_stamp-centcom - stampedBy: - - CentCom - content: >- - Oh yeah, we didn't have enough time to setup cryo so have fun. - - - From CentCom - type: Paper - proto: PaperBin10 entities: - uid: 11396 @@ -91810,7 +91500,7 @@ entities: entities: - uid: 11440 components: - - pos: -5.5403833,47.544777 + - pos: -5.580695,47.69453 parent: 2 type: Transform - proto: PlaqueAtmos @@ -92827,13 +92517,6 @@ entities: type: Transform - proto: Poweredlight entities: - - uid: 4193 - components: - - pos: -16.5,29.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 5455 components: - rot: -1.5707963267948966 rad @@ -93019,14 +92702,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11620 - components: - - rot: 1.5707963267948966 rad - pos: -12.5,-4.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11621 components: - rot: 1.5707963267948966 rad @@ -93043,14 +92718,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11623 - components: - - rot: -1.5707963267948966 rad - pos: 13.5,-4.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11624 components: - rot: -1.5707963267948966 rad @@ -93591,14 +93258,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11697 - components: - - rot: 1.5707963267948966 rad - pos: 15.5,-7.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11698 components: - rot: -1.5707963267948966 rad @@ -93695,14 +93354,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11711 - components: - - rot: 1.5707963267948966 rad - pos: 27.5,-16.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11712 components: - rot: 1.5707963267948966 rad @@ -94711,21 +94362,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11847 - components: - - rot: -1.5707963267948966 rad - pos: -2.5,12.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 11848 - components: - - pos: 7.5,12.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11849 components: - rot: 3.141592653589793 rad @@ -95263,14 +94899,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11920 - components: - - rot: -1.5707963267948966 rad - pos: -26.5,25.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11921 components: - rot: 1.5707963267948966 rad @@ -95631,13 +95259,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11970 - components: - - pos: -22.5,18.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11971 components: - pos: 34.5,13.5 @@ -95683,22 +95304,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11977 - components: - - rot: 1.5707963267948966 rad - pos: -20.5,-37.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 11978 - components: - - rot: 1.5707963267948966 rad - pos: -20.5,-34.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 11979 components: - rot: -1.5707963267948966 rad @@ -95829,13 +95434,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 11999 - components: - - pos: -36.5,-19.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12000 components: - pos: -31.5,-19.5 @@ -95988,30 +95586,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12021 - components: - - rot: -1.5707963267948966 rad - pos: -28.5,28.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 12022 - components: - - rot: 1.5707963267948966 rad - pos: -33.5,28.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 12023 - components: - - rot: 1.5707963267948966 rad - pos: -33.5,22.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12024 components: - rot: -1.5707963267948966 rad @@ -96100,13 +95674,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12035 - components: - - pos: -42.5,-11.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12036 components: - pos: -48.5,-14.5 @@ -96269,14 +95836,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12057 - components: - - rot: 1.5707963267948966 rad - pos: 47.5,-25.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12058 components: - rot: -1.5707963267948966 rad @@ -96285,29 +95844,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12059 - components: - - pos: 53.5,-27.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 12060 - components: - - rot: 3.141592653589793 rad - pos: 53.5,-31.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 12061 - components: - - rot: 3.141592653589793 rad - pos: 50.5,-31.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12062 components: - pos: -31.5,-7.5 @@ -96375,13 +95911,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12071 - components: - - pos: -45.5,-32.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12072 components: - pos: -48.5,-32.5 @@ -96404,14 +95933,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12076 - components: - - rot: -1.5707963267948966 rad - pos: -10.5,33.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12077 components: - rot: -1.5707963267948966 rad @@ -96420,22 +95941,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12078 - components: - - rot: -1.5707963267948966 rad - pos: 64.5,2.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 12079 - components: - - rot: -1.5707963267948966 rad - pos: 70.5,8.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12080 components: - rot: 3.141592653589793 rad @@ -96460,14 +95965,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12083 - components: - - rot: 3.141592653589793 rad - pos: -37.5,-38.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12084 components: - rot: -1.5707963267948966 rad @@ -96566,14 +96063,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12097 - components: - - rot: -1.5707963267948966 rad - pos: 65.5,-6.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12098 components: - rot: -1.5707963267948966 rad @@ -96590,14 +96079,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12100 - components: - - rot: -1.5707963267948966 rad - pos: 65.5,-12.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12101 components: - rot: -1.5707963267948966 rad @@ -96606,14 +96087,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12102 - components: - - rot: -1.5707963267948966 rad - pos: 65.5,-18.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12103 components: - rot: -1.5707963267948966 rad @@ -96622,14 +96095,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12104 - components: - - rot: -1.5707963267948966 rad - pos: -36.5,19.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12105 components: - rot: 1.5707963267948966 rad @@ -96638,14 +96103,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12106 - components: - - rot: -1.5707963267948966 rad - pos: -38.5,12.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12107 components: - pos: -40.5,14.5 @@ -96802,14 +96259,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12127 - components: - - rot: 3.141592653589793 rad - pos: 82.5,6.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12128 components: - pos: 77.5,13.5 @@ -96817,14 +96266,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12129 - components: - - rot: 1.5707963267948966 rad - pos: 72.5,6.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12130 components: - pos: 71.5,2.5 @@ -96832,22 +96273,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12131 - components: - - rot: -1.5707963267948966 rad - pos: 2.5,31.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - - uid: 12132 - components: - - rot: -1.5707963267948966 rad - pos: 6.5,44.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12133 components: - rot: 3.141592653589793 rad @@ -96856,14 +96281,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12134 - components: - - rot: 3.141592653589793 rad - pos: 44.5,17.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12135 components: - rot: 3.141592653589793 rad @@ -96872,14 +96289,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12136 - components: - - rot: 1.5707963267948966 rad - pos: 59.5,28.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12137 components: - pos: 63.5,31.5 @@ -96895,13 +96304,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 12139 - components: - - pos: 76.5,28.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 12328 components: - rot: 3.141592653589793 rad @@ -97059,14 +96461,6 @@ entities: type: Transform - enabled: False type: AmbientSound - - uid: 18219 - components: - - rot: 1.5707963267948966 rad - pos: 78.5,3.5 - parent: 2 - type: Transform - - enabled: False - type: AmbientSound - uid: 18268 components: - rot: -1.5707963267948966 rad @@ -97225,6 +96619,11 @@ entities: type: Transform - proto: Rack entities: + - uid: 497 + components: + - pos: 8.5,-20.5 + parent: 2 + type: Transform - uid: 11035 components: - pos: 41.5,-19.5 @@ -97521,18 +96920,6 @@ entities: pos: -3.5,12.5 parent: 2 type: Transform - - uid: 12208 - components: - - rot: -1.5707963267948966 rad - pos: 13.5,-20.5 - parent: 2 - type: Transform - - uid: 12209 - components: - - rot: -1.5707963267948966 rad - pos: 14.5,-20.5 - parent: 2 - type: Transform - uid: 13292 components: - rot: -1.5707963267948966 rad @@ -97567,6 +96954,11 @@ entities: - pos: 44.5,17.5 parent: 2 type: Transform + - uid: 17507 + components: + - pos: 9.5,-20.5 + parent: 2 + type: Transform - uid: 17857 components: - pos: 48.5,-53.5 @@ -102023,17 +101415,6 @@ entities: - pos: 64.50942,30.676907 parent: 2 type: Transform -- proto: Screwdriver - entities: - - uid: 10129 - components: - - flags: InContainer - type: MetaData - - parent: 6249 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: SecurityTechFab entities: - uid: 12937 @@ -105170,6 +104551,34 @@ entities: - pos: 16.5,20.5 parent: 2 type: Transform +- proto: SpawnPointSeniorEngineer + entities: + - uid: 17546 + components: + - pos: -1.5,-15.5 + parent: 2 + type: Transform +- proto: SpawnPointSeniorOfficer + entities: + - uid: 101 + components: + - pos: 9.5,20.5 + parent: 2 + type: Transform +- proto: SpawnPointSeniorPhysician + entities: + - uid: 17592 + components: + - pos: 55.5,10.5 + parent: 2 + type: Transform +- proto: SpawnPointSeniorResearcher + entities: + - uid: 17593 + components: + - pos: 45.5,-2.5 + parent: 2 + type: Transform - proto: SpawnPointServiceWorker entities: - uid: 13402 @@ -105360,13 +104769,6 @@ entities: - pos: 69.5,6.5 parent: 2 type: Transform -- proto: StimkitFilled - entities: - - uid: 13431 - components: - - pos: 27.506102,-34.4103 - parent: 2 - type: Transform - proto: StoolBar entities: - uid: 13432 @@ -106630,6 +106032,40 @@ entities: pos: -1.5,-42.5 parent: 2 type: Transform + - uid: 17591 + components: + - rot: 1.5707963267948966 rad + pos: -11.5,7.5 + parent: 2 + type: Transform + - uid: 18979 + components: + - rot: -1.5707963267948966 rad + pos: 12.5,6.5 + parent: 2 + type: Transform + - uid: 18980 + components: + - pos: -4.5,11.5 + parent: 2 + type: Transform + - uid: 18981 + components: + - pos: 6.5,11.5 + parent: 2 + type: Transform + - uid: 18982 + components: + - rot: -1.5707963267948966 rad + pos: 12.5,0.5 + parent: 2 + type: Transform + - uid: 18983 + components: + - rot: 1.5707963267948966 rad + pos: -11.5,0.5 + parent: 2 + type: Transform - proto: SurveillanceCameraGeneral entities: - uid: 13513 @@ -107610,12 +107046,6 @@ entities: - pos: -27.5,-29.5 parent: 2 type: Transform - - uid: 13676 - components: - - rot: 3.141592653589793 rad - pos: -49.5,-28.5 - parent: 2 - type: Transform - uid: 13677 components: - rot: 3.141592653589793 rad @@ -109692,41 +109122,161 @@ entities: - pos: 5.5,-40.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17579 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - uid: 14026 components: - pos: 6.5,-40.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17580 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - uid: 14027 components: - pos: 1.5,-42.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17581 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - uid: 14028 components: - pos: 2.5,-42.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17582 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - uid: 14029 components: - pos: 2.5,-40.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17583 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - uid: 14030 components: - pos: 1.5,-40.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17584 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - uid: 14031 components: - pos: 6.5,-42.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17585 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - uid: 14032 components: - pos: 5.5,-42.5 parent: 2 type: Transform + - containers: + key_slots: !type:Container + showEnts: False + occludes: True + ents: + - 17586 + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - proto: TelecomServerCircuitboard entities: - uid: 17983 @@ -111402,12 +110952,6 @@ entities: pos: -1.5,10.5 parent: 2 type: Transform - - uid: 14212 - components: - - rot: 1.5707963267948966 rad - pos: 14.5,-8.5 - parent: 2 - type: Transform - uid: 14213 components: - rot: 1.5707963267948966 rad @@ -111545,24 +111089,6 @@ entities: pos: 6.5,-16.5 parent: 2 type: Transform - - uid: 14236 - components: - - rot: 1.5707963267948966 rad - pos: 14.5,-7.5 - parent: 2 - type: Transform - - uid: 14237 - components: - - rot: 1.5707963267948966 rad - pos: 14.5,-6.5 - parent: 2 - type: Transform - - uid: 14238 - components: - - rot: 1.5707963267948966 rad - pos: 14.5,-5.5 - parent: 2 - type: Transform - uid: 14239 components: - rot: 1.5707963267948966 rad @@ -120403,6 +119929,11 @@ entities: - pos: 78.5,26.5 parent: 2 type: Transform + - uid: 17589 + components: + - pos: 14.5,-9.5 + parent: 2 + type: Transform - uid: 17661 components: - pos: 56.5,-46.5 @@ -120966,6 +120497,11 @@ entities: - pos: 0.5,-5.5 parent: 18594 type: Transform + - uid: 18988 + components: + - pos: 0.5,-10.5 + parent: 18594 + type: Transform - proto: WallSolid entities: - uid: 13279 diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 47559f9300b0c8..7fe3976f926ca3 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -19,39 +19,50 @@ overflowJobs: - Passenger availableJobs: - CargoTechnician: [ 3, 3 ] - Passenger: [ -1, -1 ] + #service Bartender: [ 2, 2 ] Botanist: [ 3, 3] Chef: [ 1, 2 ] - Clown: [ 1, 1 ] Janitor: [ 2, 2 ] - Mime: [ 1, 1 ] Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 3 ] + #engineering ChiefEngineer: [ 1, 1 ] StationEngineer: [ 4, 4 ] + AtmosphericTechnician: [ 2, 2 ] + TechnicalAssistant: [ 2, 3 ] + SeniorEngineer: [ 1, 1 ] + #medical ChiefMedicalOfficer: [ 1, 1 ] MedicalDoctor: [ 3, 4 ] Chemist: [ 2, 3 ] + MedicalIntern: [ 2, 3 ] + Paramedic: [ 1, 2 ] + SeniorPhysician: [ 1, 1 ] + #science ResearchDirector: [ 1, 1 ] Scientist: [ 3, 4 ] + ResearchAssistant: [ 2, 2 ] + SeniorResearcher: [ 1, 1 ] + #security HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] - Chaplain: [ 1, 1 ] Warden: [ 1, 1 ] - Librarian: [ 1, 1 ] Lawyer: [ 2, 2 ] + SecurityCadet: [ 2, 2 ] + Detective: [ 1, 1 ] + SeniorOfficer: [ 1, 1 ] + #supply + CargoTechnician: [ 3, 3 ] Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] Musician: [ 1, 1 ] - AtmosphericTechnician: [ 2, 2 ] - TechnicalAssistant: [ 2, 3 ] - MedicalIntern: [ 2, 3 ] - ServiceWorker: [ 2, 3 ] - SecurityCadet: [ 2, 2 ] - Detective: [ 1, 1 ] - ResearchAssistant: [ 2, 2 ] - Paramedic: [ 1, 2 ] Boxer: [ 2, 2 ] Reporter: [ 1, 2 ] From c00601acfc2693b321924952588efed7965d35fc Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 30 Jul 2023 20:29:33 +1000 Subject: [PATCH 04/30] Cleanup metadata + xform on entitytest (#18396) --- Content.IntegrationTests/Tests/EntityTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 2516decf7250d0..6ce9c9206f6477 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -271,6 +271,7 @@ await server.WaitAssertion(() => // such as MetaData or Transform if (entityManager.HasComponent(entity, type)) { + entityManager.DeleteEntity(entity); continue; } From fae9a05ea23d9554689475b01f2e28f37f05fe4f Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 30 Jul 2023 20:47:44 +1000 Subject: [PATCH 05/30] Event horizon serialization (#18173) --- .../EntitySystems/EventHorizonSystem.cs | 19 ++++++++++++++++--- .../Components/EventHorizonComponent.cs | 13 ++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs index 312ac5739db0fb..cca68ccc5e74d4 100644 --- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs @@ -40,6 +40,8 @@ public override void Initialize() SubscribeLocalEvent(PreventConsume); SubscribeLocalEvent(PreventConsume); SubscribeLocalEvent(PreventConsume); + SubscribeLocalEvent(OnHorizonMapInit); + SubscribeLocalEvent(OnHorizonUnpaused); SubscribeLocalEvent(OnStartCollide); SubscribeLocalEvent(OnEventHorizonContained); SubscribeLocalEvent(OnEventHorizonContained); @@ -51,6 +53,16 @@ public override void Initialize() vvHandle.AddPath(nameof(EventHorizonComponent.TargetConsumePeriod), (_, comp) => comp.TargetConsumePeriod, SetConsumePeriod); } + private void OnHorizonMapInit(EntityUid uid, EventHorizonComponent component, MapInitEvent args) + { + component.NextConsumeWaveTime = _timing.CurTime; + } + + private void OnHorizonUnpaused(EntityUid uid, EventHorizonComponent component, ref EntityUnpausedEvent args) + { + component.NextConsumeWaveTime += args.PausedTime; + } + public override void Shutdown() { var vvHandle = Vvm.GetTypeHandler(); @@ -82,10 +94,10 @@ public void Update(EntityUid uid, EventHorizonComponent? eventHorizon = null, Tr if (!Resolve(uid, ref eventHorizon)) return; - eventHorizon.LastConsumeWaveTime = _timing.CurTime; - eventHorizon.NextConsumeWaveTime = eventHorizon.LastConsumeWaveTime + eventHorizon.TargetConsumePeriod; + eventHorizon.NextConsumeWaveTime += eventHorizon.TargetConsumePeriod; if (eventHorizon.BeingConsumedByAnotherEventHorizon) return; + if (!Resolve(uid, ref xform)) return; @@ -331,8 +343,9 @@ public void SetConsumePeriod(EntityUid uid, TimeSpan value, EventHorizonComponen if (MathHelper.CloseTo(eventHorizon.TargetConsumePeriod.TotalSeconds, value.TotalSeconds)) return; + var diff = (value - eventHorizon.TargetConsumePeriod); eventHorizon.TargetConsumePeriod = value; - eventHorizon.NextConsumeWaveTime = eventHorizon.LastConsumeWaveTime + eventHorizon.TargetConsumePeriod; + eventHorizon.NextConsumeWaveTime += diff; var curTime = _timing.CurTime; if (eventHorizon.NextConsumeWaveTime < curTime) diff --git a/Content.Shared/Singularity/Components/EventHorizonComponent.cs b/Content.Shared/Singularity/Components/EventHorizonComponent.cs index ce4f263077da8b..d0febda789294d 100644 --- a/Content.Shared/Singularity/Components/EventHorizonComponent.cs +++ b/Content.Shared/Singularity/Components/EventHorizonComponent.cs @@ -1,5 +1,6 @@ using Robust.Shared.GameStates; using Content.Shared.Singularity.EntitySystems; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; namespace Content.Shared.Singularity.Components; @@ -59,19 +60,13 @@ public sealed class EventHorizonComponent : Component /// [DataField("consumePeriod")] [ViewVariables(VVAccess.ReadWrite)] - public TimeSpan TargetConsumePeriod { get; set; } = TimeSpan.FromSeconds(0.5); - - /// - /// The last time at which this consumed everything it overlapped with. - /// - [ViewVariables(VVAccess.ReadOnly)] - public TimeSpan LastConsumeWaveTime { get; set; } = default!; + public TimeSpan TargetConsumePeriod = TimeSpan.FromSeconds(0.5); /// /// The next time at which this consumed everything it overlapped with. /// - [ViewVariables(VVAccess.ReadOnly)] - public TimeSpan NextConsumeWaveTime { get; set; } = default!; + [ViewVariables(VVAccess.ReadOnly), DataField("nextConsumeWaveTime", customTypeSerializer:typeof(TimeOffsetSerializer))] + public TimeSpan NextConsumeWaveTime; #endregion Update Timing } From 9647d2cf59edf731065b0d80e3eb3cd38a4ef8b7 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 31 Jul 2023 04:53:41 +1000 Subject: [PATCH 06/30] Nerf silicon prices (#18455) No more factorio gaming --- Resources/Prototypes/Body/Parts/silicon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml index 804fe5b5e23a57..4a82ae8665a0a6 100644 --- a/Resources/Prototypes/Body/Parts/silicon.yml +++ b/Resources/Prototypes/Body/Parts/silicon.yml @@ -12,7 +12,7 @@ bodypart: !type:Container ents: [] - type: StaticPrice - price: 100 + price: 5 - type: Tag tags: - Trash From b0b1597aadbd26a22b6cb18dd669913e5e7f541e Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 31 Jul 2023 04:53:54 +1000 Subject: [PATCH 07/30] Fix cargo gifts (#18449) Some of the IDs were invalid and no typeserializer. --- .../Components/CargoGiftsRuleComponent.cs | 6 +++-- .../StationEvents/Events/CargoGiftsRule.cs | 5 ++-- .../Events/StationEventSystem.cs | 25 ++++++++++++++----- .../Cargo/Prototypes/CargoProductPrototype.cs | 2 +- .../Prototypes/GameRules/cargo_gifts.yml | 6 ++--- 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs b/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs index bb4f834cb31b32..5c433e0d2c0f43 100644 --- a/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs +++ b/Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs @@ -1,6 +1,8 @@ using Content.Server.StationEvents.Events; +using Content.Shared.Cargo.Prototypes; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; namespace Content.Server.StationEvents.Components; @@ -38,8 +40,8 @@ public sealed class CargoGiftsRuleComponent : Component /// Cargo that you would like gifted to the station, with the quantity for each /// Use Ids from cargoProduct Prototypes /// - [DataField("gifts"), ViewVariables(VVAccess.ReadWrite)] - public Dictionary Gifts = new Dictionary(); + [DataField("gifts", required: true, customTypeSerializer:typeof(PrototypeIdDictionarySerializer)), ViewVariables(VVAccess.ReadWrite)] + public Dictionary Gifts = new(); /// /// How much space (minimum) you want to leave in the order database for supply to actually do their work diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs index f6ee90a568a58c..51fafd6cb30a5d 100644 --- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs +++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs @@ -30,16 +30,15 @@ protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, protected override void ActiveTick(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, float frameTime) { if (component.Gifts.Count == 0) - { return; - } if (component.TimeUntilNextGifts > 0) { component.TimeUntilNextGifts -= frameTime; return; } - component.TimeUntilNextGifts = 30f; + + component.TimeUntilNextGifts += 30f; if (!TryGetRandomStation(out var station, HasComp)) return; diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs index 93ad06966552bd..ac3d2980b90691 100644 --- a/Content.Server/StationEvents/Events/StationEventSystem.cs +++ b/Content.Server/StationEvents/Events/StationEventSystem.cs @@ -9,6 +9,7 @@ using Content.Server.Station.Systems; using Content.Server.StationEvents.Components; using Content.Shared.Database; +using Robust.Shared.Collections; using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Player; @@ -135,20 +136,32 @@ protected void ForceEndSelf(EntityUid uid, GameRuleComponent? component = null) protected bool TryGetRandomStation([NotNullWhen(true)] out EntityUid? station, Func? filter = null) { + var stations = new ValueList(); + + if (filter == null) + { + stations.EnsureCapacity(Count()); + } + filter ??= _ => true; + var query = AllEntityQuery(); + + while (query.MoveNext(out var uid, out _)) + { + if (!filter(uid)) + continue; - // augh. sorry sloth there's no better API and my goal today isn't adding 50 entitymanager methods :waa: - var stations = EntityManager.GetAllComponents(typeof(StationEventEligibleComponent)).Select(x => x.Uid).Where(filter).ToArray(); + stations.Add(uid); + } - if (stations.Length == 0) + if (stations.Count == 0) { station = null; return false; } - - station = RobustRandom.Pick(stations); - + // TODO: Engine PR. + station = stations[RobustRandom.Next(stations.Count)]; return true; } diff --git a/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs index e918f1c062365e..a08fc00eb50148 100644 --- a/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs +++ b/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Cargo.Prototypes { - [NetSerializable, Serializable, Prototype("cargoProduct")] + [Prototype("cargoProduct")] public sealed class CargoProductPrototype : IPrototype { [DataField("name")] private string _name = string.Empty; diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index aaf4cbadc0d564..799805272d6916 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -184,7 +184,7 @@ sender: cargo-gift-default-sender dest: cargo-gift-dest-sec gifts: - CrateSecurityArmor: 3 + SecurityArmor: 3 ArmorySmg: 1 ArmoryShotgun: 1 ArmoryLaser: 1 @@ -206,5 +206,5 @@ dest: cargo-gift-dest-sec gifts: SecurityRiot: 2 - CrateRestraints: 2 - CrateSecurityNonlethal: 2 + SecurityRestraints: 2 + SecurityNonLethal: 2 From d2744b60c3afa13398085b882b2cfd73c3d204a6 Mon Sep 17 00:00:00 2001 From: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com> Date: Mon, 31 Jul 2023 04:54:13 +1000 Subject: [PATCH 08/30] made the hristov just a little greater (#18447) --- Resources/Locale/en-US/store/uplink-catalog.ftl | 3 +++ .../Prototypes/Catalog/Fills/Items/briefcases.yml | 4 ++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 11 +++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 32fbb11bbef776..1fc1462b704afc 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -67,6 +67,9 @@ uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catri uplink-mosin-ammo-name = ammunition box (.30 rifle) uplink-mosin-ammo-desc = A box of cartridges for the surplus rifle. +uplink-sniper-ammo-name = ammunition box (.60 antimateriel) +uplink-sniper-ammo-desc = a box of 10 cartridges for the hristov sniper rifle + # Utility uplink-holopara-kit-name = Holoparasite Kit uplink-holopara-kit-desc = The pride and joy of Cybersun. Contains an injector that hosts a sentient metaphysical guardian made of hard light which resides in the user's body when not active. diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 9cbb795b6fd0e4..72635ca5ac8e45 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -13,7 +13,7 @@ id: BriefcaseSyndieSniperBundleFilled name: brown briefcase parent: BriefcaseSyndie - suffix: Filled + suffix: SniperBundle components: - type: StorageFill contents: @@ -22,4 +22,4 @@ - id: ClothingNeckTieRed - id: ClothingHandsGlovesLatex - id: ClothingUniformJumpsuitLawyerBlack - - id: ClothingShoesBootsLaceup + - id: ClothingShoesBootsLaceup \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index d40abaccf507b8..217becaee29ada 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -252,6 +252,17 @@ categories: - UplinkAmmo +# for the hristov +- type: listing + id: UplinkHristovAmmo + name: uplink-sniper-ammo-name + description: uplink-sniper-ammo-desc + productEntity: MagazineBoxAntiMateriel + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + #Utility - type: listing From e6f6fbc29385a65831e35609461d19955d4e6aa6 Mon Sep 17 00:00:00 2001 From: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com> Date: Mon, 31 Jul 2023 04:54:45 +1000 Subject: [PATCH 09/30] air and gas mask in syndie EVA and hardsuit bundle (#18442) --- Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index b857e30bf619a6..7e446f5955d332 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -240,6 +240,8 @@ contents: - id: ClothingHeadHelmetSyndicate - id: ClothingOuterHardsuitSyndicate + - id: ClothingMaskGasSyndicate + - id: DoubleEmergencyOxygenTankFilled - type: entity parent: ClothingBackpackDuffelSyndicateBundle @@ -250,6 +252,8 @@ - type: StorageFill contents: - id: ClothingOuterHardsuitSyndie + - id: ClothingMaskGasSyndicate + - id: ClothingHandsGlovesCombat - type: entity parent: ClothingBackpackDuffelSyndicateBundle From 44b44fd391c24201aa5e4fe2611a4e73703f3ee6 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 30 Jul 2023 14:55:49 -0400 Subject: [PATCH 10/30] Automatic changelog update --- Resources/Changelog/Changelog.yml | 33 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c59caa555f9aa1..4afb6159268493 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,19 +1,4 @@ Entries: -- author: liltenhead - changes: - - {message: Fix uplink typos, type: Fix} - id: 3877 - time: '2023-05-27T05:33:19.0000000+00:00' -- author: MrGreen and OctoRocket - changes: - - {message: Added a CentCom scarf., type: Add} - id: 3878 - time: '2023-05-27T09:09:33.0000000+00:00' -- author: metalgearsloth - changes: - - {message: Change grappling gun tech from Experimental to Industrial., type: Fix} - id: 3879 - time: '2023-05-27T12:19:03.0000000+00:00' - author: malchanceux changes: - {message: NanoTrasen Counterintelligence has uncovered that threat actors have @@ -2972,3 +2957,21 @@ Entries: - {message: Changed the placeholder comms computer description, type: Tweak} id: 4376 time: '2023-07-30T02:35:54.0000000+00:00' +- author: metalgearsloth + changes: + - {message: Fix some cargo gifts not spawning correctly., type: Fix} + id: 4377 + time: '2023-07-30T18:53:54.0000000+00:00' +- author: JoeHammad + changes: + - {message: The syndicate has managed to secure a deal with lockheed-michael to + get the necessary stock to place 10 round .60 antimateriel rounds into the uplink + for 2TC, type: Add} + id: 4378 + time: '2023-07-30T18:54:14.0000000+00:00' +- author: JoeHammad + changes: + - {message: The syndicate has decided to add slightly more gear to their EVA and + hardsuit bundles, type: Add} + id: 4379 + time: '2023-07-30T18:54:45.0000000+00:00' From 2efb5bcb66de209fab97e34a2fba3a1bc1ae46e4 Mon Sep 17 00:00:00 2001 From: liltenhead <104418166+liltenhead@users.noreply.github.com> Date: Sun, 30 Jul 2023 15:38:18 -0700 Subject: [PATCH 11/30] Fix Emergency Medipen Typo (#18476) --- .../Prototypes/Entities/Objects/Specific/Medical/hypospray.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index b5e7d8d46fdabf..1561e064919630 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -93,7 +93,7 @@ name: emergency medipen parent: ChemicalMedipen id: EmergencyMedipen - description: A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Beware, as it's easy to overdose on epinephrine and tranexmic acid. + description: A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Beware, as it's easy to overdose on epinephrine and tranexamic acid. components: - type: SolutionContainerManager solutions: From 8298b64a250206886f395813fcbf4eb612301de7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 30 Jul 2023 18:39:22 -0400 Subject: [PATCH 12/30] Automatic changelog update --- Resources/Changelog/Changelog.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4afb6159268493..0905f89459c37f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: malchanceux - changes: - - {message: NanoTrasen Counterintelligence has uncovered that threat actors have - started recruiting atmospheric technicians into their ranks. Whether this is - genuine or a red herring remains to be seen., type: Add} - id: 3880 - time: '2023-05-27T19:50:51.0000000+00:00' - author: brainfood1183 changes: - {message: Station Map has been resprited and can now be constructed., type: Add} @@ -2975,3 +2968,8 @@ Entries: hardsuit bundles, type: Add} id: 4379 time: '2023-07-30T18:54:45.0000000+00:00' +- author: liltenhead + changes: + - {message: Fixed typo in emergency medipen description, type: Fix} + id: 4380 + time: '2023-07-30T22:38:18.0000000+00:00' From c15257fa21c2f00451174ce70cec423de90e15fc Mon Sep 17 00:00:00 2001 From: avery <51971268+graevy@users.noreply.github.com> Date: Sun, 30 Jul 2023 18:07:45 -0700 Subject: [PATCH 13/30] Add reflection support for mobs, reflective vest, shuttle walls (#18186) --- .../Weapons/Reflect/ReflectSystem.cs | 1 + .../Weapons/Reflect/SharedReflectSystem.cs | 52 +++++++++++++++++++ .../Entities/Clothing/OuterClothing/armor.yml | 4 +- .../Clothing/Uniforms/ship_vs_ship.yml | 2 +- .../Prototypes/Entities/Mobs/Species/base.yml | 3 ++ .../Entities/Structures/Walls/walls.yml | 4 ++ 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/Content.Server/Weapons/Reflect/ReflectSystem.cs b/Content.Server/Weapons/Reflect/ReflectSystem.cs index 4045bf7b79f1e8..48dffd87e360f1 100644 --- a/Content.Server/Weapons/Reflect/ReflectSystem.cs +++ b/Content.Server/Weapons/Reflect/ReflectSystem.cs @@ -9,6 +9,7 @@ public sealed class ReflectSystem : SharedReflectSystem public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(EnableReflect); SubscribeLocalEvent(DisableReflect); SubscribeLocalEvent(ShieldEnableReflect); diff --git a/Content.Shared/Weapons/Reflect/SharedReflectSystem.cs b/Content.Shared/Weapons/Reflect/SharedReflectSystem.cs index e38c08a9d0b07a..302fd8ac9a2aa4 100644 --- a/Content.Shared/Weapons/Reflect/SharedReflectSystem.cs +++ b/Content.Shared/Weapons/Reflect/SharedReflectSystem.cs @@ -5,6 +5,8 @@ using Content.Shared.Database; using Content.Shared.Hands.Components; using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Inventory; +using Content.Shared.Inventory.Events; using Robust.Shared.Physics.Components; using Content.Shared.Popups; using Content.Shared.Projectiles; @@ -27,15 +29,20 @@ public abstract class SharedReflectSystem : EntitySystem [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly InventorySystem _inventorySystem = default!; public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(OnHandReflectProjectile); SubscribeLocalEvent(OnHandsReflectHitscan); SubscribeLocalEvent(OnReflectCollide); SubscribeLocalEvent(OnReflectHitscan); + + SubscribeLocalEvent(OnReflectEquipped); + SubscribeLocalEvent(OnReflectUnequipped); } private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref ProjectileCollideEvent args) @@ -160,4 +167,49 @@ private bool TryReflectHitscan(EntityUid reflector, EntityUid? shooter, EntityUi return true; } + + private void OnReflectEquipped(EntityUid uid, ReflectComponent comp, GotEquippedEvent args) + { + + if (!TryComp(args.Equipee, out ReflectComponent? reflection)) + return; + + reflection.Enabled = true; + + // reflection probability should be: (1 - old probability) * newly-equipped item probability + old probability + // example: if entity has .25 reflection and newly-equipped item has .7, entity should have (1 - .25) * .7 + .25 = .775 + reflection.ReflectProb += (1 - reflection.ReflectProb) * comp.ReflectProb; + + } + + private void OnReflectUnequipped(EntityUid uid, ReflectComponent comp, GotUnequippedEvent args) + { + + if (!TryComp(args.Equipee, out ReflectComponent? reflection)) + return; + + if (!_inventorySystem.TryGetSlots(args.Equipee, out var slotDef)) + return; + + // you could recalculate reflectprob with new = (old - component) / (1 - component), but component=1 introduces loss + // still need to either maintain a counter or loop through all slots to determine reflection.enabled anyway? + float newProb = 1; + var reflecting = false; + + foreach (var slot in slotDef) + { + if (!_inventorySystem.TryGetSlotEntity(args.Equipee, slot.Name, out var slotEnt)) + continue; + + if (!TryComp(slotEnt, out ReflectComponent? refcomp)) + continue; + + reflecting = true; + var prob = refcomp.ReflectProb; + newProb -= newProb * prob; + } + + reflection.ReflectProb = 1 - newProb; + reflection.Enabled = reflecting; + } } diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 06cdb94fa17ac9..1d30482db388d2 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -94,6 +94,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature + - type: Reflect + reflectProb: 1 - type: entity parent: ClothingOuterBaseLarge @@ -246,7 +248,7 @@ Radiation: 0.8 - type: ClothingSpeedModifier walkModifier: 0.7 - sprintModifier: 0.65 + sprintModifier: 0.65 - type: ExplosionResistance damageCoefficient: 0.5 - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml index bb42d7d51dfabc..d6999a0a265dd4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml @@ -93,4 +93,4 @@ - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi \ No newline at end of file + sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 4fe8bb1e429791..ebbd76d7a5e544 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -149,6 +149,9 @@ visible: false - type: Physics bodyType: KinematicController + - type: Reflect + enabled: false + reflectProb: 0 - type: Fixtures fixtures: # TODO: This needs a second fixture just for mob collisions. fix1: diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index e6faa23a1b310d..4da0c572737aeb 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -672,6 +672,8 @@ damageModifierSet: Metallic - type: Physics bodyType: Static + - type: Reflect + reflectProb: 1 - type: Pullable - type: Airtight noAirWhenFullyAirBlocked: false @@ -743,6 +745,8 @@ acts: ["Destruction"] destroySound: path: /Audio/Effects/metalbreak.ogg + - type: Reflect + reflectProb: 1 - type: IconSmooth key: walls base: state From 5dead36340ebb18ff8ee98d5c6e23230ded8430d Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 30 Jul 2023 21:08:50 -0400 Subject: [PATCH 14/30] Automatic changelog update --- Resources/Changelog/Changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0905f89459c37f..abaceb8b7e5d59 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,9 +1,4 @@ Entries: -- author: brainfood1183 - changes: - - {message: Station Map has been resprited and can now be constructed., type: Add} - id: 3881 - time: '2023-05-28T06:42:41.0000000+00:00' - author: '0x6273' changes: - {message: Emitters and APEs can now be controlled with device linking., type: Add} @@ -2973,3 +2968,8 @@ Entries: - {message: Fixed typo in emergency medipen description, type: Fix} id: 4380 time: '2023-07-30T22:38:18.0000000+00:00' +- author: graevy + changes: + - {message: Added reflection to the reflective vest and shuttle walls, type: Add} + id: 4381 + time: '2023-07-31T01:07:46.0000000+00:00' From a8e2be75391ff86315f772766f2ac05f97665f6c Mon Sep 17 00:00:00 2001 From: coolmankid12345 <55817627+coolmankid12345@users.noreply.github.com> Date: Sun, 30 Jul 2023 21:11:56 -0400 Subject: [PATCH 15/30] Give me more nukies (#18210) --- Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index b72433cfc1bedd..38bf8c6fc74ae6 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -459,7 +459,7 @@ private void OnPlayersSpawning(RulePlayerSpawningEvent ev) } } - var numNukies = MathHelper.Clamp(ev.PlayerPool.Count / playersPerOperative, 1, maxOperatives); + var numNukies = MathHelper.Clamp(_playerSystem.PlayerCount / playersPerOperative, 1, maxOperatives); for (var i = 0; i < numNukies; i++) { From 3e599e230674684b62f2ee4e5afe95ed6d85c96f Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:57:52 +1200 Subject: [PATCH 16/30] Add missing CleanReturnAsync() to some tests. (#18471) --- .../Tests/Body/SaveLoadReparentTest.cs | 4 ++ .../Tests/LogErrorTest.cs | 2 + .../Tests/Networking/ConnectTest.cs | 2 + Content.Server/Body/Systems/BodySystem.cs | 65 ++++++++++++++++++- Content.Shared/Body/Organ/OrganComponent.cs | 3 +- Content.Shared/Body/Part/BodyPartComponent.cs | 7 +- .../Body/Systems/SharedBodySystem.Body.cs | 2 +- .../Body/Systems/SharedBodySystem.Parts.cs | 6 +- 8 files changed, 84 insertions(+), 7 deletions(-) diff --git a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs index d89048ce53962e..c6a13a5861bf3c 100644 --- a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs +++ b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs @@ -157,7 +157,11 @@ await server.WaitAssertion(() => Assert.That(component.ParentSlot.Child, Is.EqualTo(id)); }); } + + maps.DeleteMap(mapId); } }); + + await pairTracker.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/LogErrorTest.cs b/Content.IntegrationTests/Tests/LogErrorTest.cs index 733d6d3b821338..a8ebb6d7b0a242 100644 --- a/Content.IntegrationTests/Tests/LogErrorTest.cs +++ b/Content.IntegrationTests/Tests/LogErrorTest.cs @@ -28,5 +28,7 @@ public async Task TestLogErrorCausesTestFailure() // But errors do await server.WaitPost(() => Assert.Throws(() => logmill.Error("test"))); await client.WaitPost(() => Assert.Throws(() => logmill.Error("test"))); + + await pairTracker.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Networking/ConnectTest.cs b/Content.IntegrationTests/Tests/Networking/ConnectTest.cs index 23f995a9b43a6d..8433c84ee467a4 100644 --- a/Content.IntegrationTests/Tests/Networking/ConnectTest.cs +++ b/Content.IntegrationTests/Tests/Networking/ConnectTest.cs @@ -30,6 +30,8 @@ public async Task TestConnect() Assert.That(clEntityManager.GetComponent(lastSvEntity).Coordinates, Is.EqualTo(svEntityManager.GetComponent(lastSvEntity).Coordinates)); + + await pairTracker.CleanReturnAsync(); } } } diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs index 57603c35dc4e99..43294976fe18ea 100644 --- a/Content.Server/Body/Systems/BodySystem.cs +++ b/Content.Server/Body/Systems/BodySystem.cs @@ -5,8 +5,8 @@ using Content.Server.Humanoid; using Content.Server.Kitchen.Components; using Content.Server.Mind; -using Content.Server.Mind.Components; using Content.Shared.Body.Components; +using Content.Shared.Body.Organ; using Content.Shared.Body.Part; using Content.Shared.Body.Prototypes; using Content.Shared.Body.Systems; @@ -36,11 +36,74 @@ public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(OnPartStartup); + SubscribeLocalEvent(OnBodyStartup); SubscribeLocalEvent(OnRelayMoveInput); SubscribeLocalEvent(OnApplyMetabolicMultiplier); SubscribeLocalEvent(OnBeingMicrowaved); } + private void OnPartStartup(EntityUid uid, BodyPartComponent component, ComponentStartup args) + { + // This inter-entity relationship makes be deeply uncomfortable because its probably going to re-encounter + // all of the networking & startup ordering issues that containers and joints have. + // TODO just use containers. Please. + + foreach (var slot in component.Children.Values) + { + DebugTools.Assert(slot.Parent == uid); + if (slot.Child == null) + continue; + + if (TryComp(slot.Child, out BodyPartComponent? child)) + { + child.ParentSlot = slot; + Dirty(slot.Child.Value); + continue; + } + + Log.Error($"Body part encountered missing limbs: {ToPrettyString(uid)}. Slot: {slot.Id}"); + slot.Child = null; + } + + foreach (var slot in component.Organs.Values) + { + DebugTools.Assert(slot.Parent == uid); + if (slot.Child == null) + continue; + + if (TryComp(slot.Child, out OrganComponent? child)) + { + child.ParentSlot = slot; + Dirty(slot.Child.Value); + continue; + } + + Log.Error($"Body part encountered missing organ: {ToPrettyString(uid)}. Slot: {slot.Id}"); + slot.Child = null; + } + } + + private void OnBodyStartup(EntityUid uid, BodyComponent component, ComponentStartup args) + { + if (component.Root is not { } slot) + return; + + DebugTools.Assert(slot.Parent == uid); + if (slot.Child == null) + return; + + if (!TryComp(slot.Child, out BodyPartComponent? child)) + { + Log.Error($"Body part encountered missing limbs: {ToPrettyString(uid)}. Slot: {slot.Id}"); + slot.Child = null; + return; + } + + child.ParentSlot = slot; + Dirty(slot.Child.Value); + } + private void OnRelayMoveInput(EntityUid uid, BodyComponent component, ref MoveInputEvent args) { if (_mobState.IsDead(uid) && _mindSystem.TryGetMind(uid, out var mind)) diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs index bd0465ff36dc4e..ac676e998038ba 100644 --- a/Content.Shared/Body/Organ/OrganComponent.cs +++ b/Content.Shared/Body/Organ/OrganComponent.cs @@ -10,6 +10,7 @@ public sealed class OrganComponent : Component [DataField("body")] public EntityUid? Body; - [DataField("parent")] + // TODO use containers. See comments in BodyPartComponent. + // Do not rely on this in client-side code. public OrganSlot? ParentSlot; } diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs index 1cc333b9bbd524..6e06b1dc0d1047 100644 --- a/Content.Shared/Body/Part/BodyPartComponent.cs +++ b/Content.Shared/Body/Part/BodyPartComponent.cs @@ -12,12 +12,17 @@ public sealed class BodyPartComponent : Component [DataField("body")] public EntityUid? Body; - [DataField("parent")] + // This inter-entity relationship makes be deeply uncomfortable because its probably going to re-encounter all of the + // networking issues that containers and joints have. + // TODO just use containers. Please. + // Do not use set or get data from this in client-side code. public BodyPartSlot? ParentSlot; + // Do not use set or get data from this in client-side code. [DataField("children")] public Dictionary Children = new(); + // See all the above ccomments. [DataField("organs")] public Dictionary Organs = new(); diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs index 3b464ca115ce4f..45cb9bfa6d7594 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs @@ -48,7 +48,7 @@ private void OnBodyHandleState(EntityUid uid, BodyComponent body, ref ComponentH if (args.Current is not BodyComponentState state) return; - body.Root = state.Root; + body.Root = state.Root; // TODO use containers. This is broken and does not work. body.GibSound = state.GibSound; } diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index eab2dae602f250..c0c1c963b49ea9 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -42,9 +42,9 @@ private void OnPartHandleState(EntityUid uid, BodyPartComponent part, ref Compon return; part.Body = state.Body; - part.ParentSlot = state.ParentSlot; - part.Children = state.Children; - part.Organs = state.Organs; + part.ParentSlot = state.ParentSlot; // TODO use containers. This is broken and does not work. + part.Children = state.Children; // TODO use containers. This is broken and does not work. + part.Organs = state.Organs; // TODO end my suffering. part.PartType = state.PartType; part.IsVital = state.IsVital; part.Symmetry = state.Symmetry; From 69c1676d9d29d2abc39f24c6d3a4caae79276435 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:32:08 +1200 Subject: [PATCH 17/30] Add enum serialization test. (#18443) --- .../Tests/Serialization/SerializationTest.cs | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 Content.IntegrationTests/Tests/Serialization/SerializationTest.cs diff --git a/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs b/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs new file mode 100644 index 00000000000000..c886bf08b53558 --- /dev/null +++ b/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs @@ -0,0 +1,82 @@ +using System.Collections.Generic; +using System.Linq; +using Robust.Shared.Reflection; +using Robust.Shared.Serialization.Manager; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Serialization.Markdown.Value; + +namespace Content.IntegrationTests.Tests.Serialization; + +[TestFixture] +public sealed class SerializationTest +{ + /// + /// Check that serializing generic enums works as intended. This should really be in engine, but engine + /// integrations tests block reflection and I am lazy.. + /// + [Test] + public async Task SerializeGenericEnums() + { + await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true }); + var server = pairTracker.Pair.Server; + var seriMan = server.ResolveDependency(); + var refMan = server.ResolveDependency(); + + Enum value = TestEnum.Bb; + + var node = seriMan.WriteValue(value, notNullableOverride:true); + var valueNode = node as ValueDataNode; + Assert.NotNull(valueNode); + + var expected = refMan.GetEnumReference(value); + Assert.That(valueNode!.Value, Is.EqualTo(expected)); + + var errors = seriMan.ValidateNode(valueNode).GetErrors(); + Assert.That(errors.Any(), Is.False); + + var deserialized = seriMan.Read(node, notNullableOverride:true); + Assert.That(deserialized, Is.EqualTo(value)); + + // Repeat test with enums in a data definitions. + var data = new TestData + { + Value = TestEnum.Cc, + Sequence = new() {TestEnum.Dd, TestEnum.Aa} + }; + + node = seriMan.WriteValue(data, notNullableOverride:true); + + errors = seriMan.ValidateNode(node).GetErrors(); + Assert.That(errors.Any(), Is.False); + + var deserializedData = seriMan.Read(node, notNullableOverride:false); + + Assert.That(deserializedData.Value, Is.EqualTo(data.Value)); + Assert.That(deserializedData.Sequence.Count, Is.EqualTo(data.Sequence.Count)); + Assert.That(deserializedData.Sequence[0], Is.EqualTo(data.Sequence[0])); + Assert.That(deserializedData.Sequence[1], Is.EqualTo(data.Sequence[1])); + + // Check that Generic & non-generic serializers are incompativle. + Enum genericValue = TestEnum.Bb; + TestEnum typedValue = TestEnum.Bb; + + var genericNode = seriMan.WriteValue(genericValue, notNullableOverride:true); + var typedNode = seriMan.WriteValue(typedValue); + + Assert.That(seriMan.ValidateNode(genericNode).GetErrors().Any(), Is.False); + Assert.That(seriMan.ValidateNode(genericNode).GetErrors().Any(), Is.True); + Assert.That(seriMan.ValidateNode(typedNode).GetErrors().Any(), Is.True); + Assert.That(seriMan.ValidateNode(typedNode).GetErrors().Any(), Is.False); + + await pairTracker.CleanReturnAsync(); + } + + private enum TestEnum : byte { Aa, Bb, Cc, Dd } + + [DataDefinition] + private sealed class TestData + { + [DataField("value")] public Enum Value = default!; + [DataField("sequence")] public List Sequence = default!; + } +} From dd04f5c4d241fa1454e019417ab3388df2ae9fca Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 31 Jul 2023 00:41:24 -0400 Subject: [PATCH 18/30] Fixes the flash overlay being offset in separated UI mode (#18415) --- Content.Client/Flash/FlashOverlay.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs index f7e7fa3d4d9e23..8b80a8a6af14db 100644 --- a/Content.Client/Flash/FlashOverlay.cs +++ b/Content.Client/Flash/FlashOverlay.cs @@ -22,7 +22,7 @@ public sealed class FlashOverlay : Overlay [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - public override OverlaySpace Space => OverlaySpace.ScreenSpace; + public override OverlaySpace Space => OverlaySpace.WorldSpace; private readonly ShaderInstance _shader; private double _startTime = -1; private double _lastsFor = 1; @@ -61,18 +61,16 @@ protected override void Draw(in OverlayDrawArgs args) if (percentComplete >= 1.0f) return; - var screenSpaceHandle = args.ScreenHandle; - screenSpaceHandle.UseShader(_shader); + var worldHandle = args.WorldHandle; + worldHandle.UseShader(_shader); _shader.SetParameter("percentComplete", percentComplete); - var screenSize = UIBox2.FromDimensions(new Vector2(0, 0), _displayManager.ScreenSize); - if (_screenshotTexture != null) { - screenSpaceHandle.DrawTextureRect(_screenshotTexture, screenSize); + worldHandle.DrawTextureRectRegion(_screenshotTexture, args.WorldBounds); } - screenSpaceHandle.UseShader(null); + worldHandle.UseShader(null); } protected override void DisposeBehavior() From c9a7bafb6a317e26f2f46b259f84498188f66a3f Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:41:38 +1000 Subject: [PATCH 19/30] Update submodule to 142.0.1 (#18483) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 204e8816903e1f..cb6645aebe238e 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 204e8816903e1f1eca944190fba059775024c0f3 +Subproject commit cb6645aebe238ee937d311a96741ff914ef50ce3 From 4c6d576f98e15915c37ea5ed4b50f993d1b4c729 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 31 Jul 2023 00:42:29 -0400 Subject: [PATCH 20/30] Automatic changelog update --- Resources/Changelog/Changelog.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index abaceb8b7e5d59..0cc5e3a05583ec 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,9 +1,4 @@ Entries: -- author: '0x6273' - changes: - - {message: Emitters and APEs can now be controlled with device linking., type: Add} - id: 3882 - time: '2023-05-28T06:44:28.0000000+00:00' - author: Chief-Engineer changes: - {message: Revenants now drop ectoplasm when they die., type: Tweak} @@ -2973,3 +2968,10 @@ Entries: - {message: Added reflection to the reflective vest and shuttle walls, type: Add} id: 4381 time: '2023-07-31T01:07:46.0000000+00:00' +- author: Bhijn and Myr + changes: + - {message: 'The flash overlay is no longer offset towards the actual physical center + of your screen when playing with the separated UI layout. Additionally, ultrawide + monitors no longer experience an exceptionally stretched flash overlay.', type: Fix} + id: 4382 + time: '2023-07-31T04:41:24.0000000+00:00' From 87d06110d83e597c4e3b1cff3c9319a30e0240e2 Mon Sep 17 00:00:00 2001 From: MishaUnity <81403616+MishaUnity@users.noreply.github.com> Date: Mon, 31 Jul 2023 08:34:22 +0300 Subject: [PATCH 21/30] Mass-media console update (#18466) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add Console, PDA news tab, and ringstone popup * Add English localization * Add mass-media console board to Advanced Entertainment resrarch * Fix misprint * Deleting unused libraries * Fix round restart problem * Fixing restart problem * Just another fix * Сode optimization * Code optimization * Convert News read tab to cartridge Convert the News read tab into a cartridge, and fix a couple of bugs * Just another fix * Some updates * More fixing!! Fix cooldown, add author label to read menu * Again, fix cooldown bug * Some minor changes * Revert "Some minor changes" This reverts commit 470c8d727629ac79994f70e56162adae8659e944. * Some minor updates * News write Ui update * Just another fix * See commit below comments * More code readability, more! --- .../MassMedia/Ui/MiniArticleCardControl.xaml | 36 +++++++++------- .../Ui/MiniArticleCardControl.xaml.cs | 5 ++- .../MassMedia/Ui/NewsWriteMenu.xaml.cs | 3 +- .../Components/NewsWriteComponent.cs | 6 +++ .../MassMedia/Systems/NewsSystem.cs | 42 +++++++++++++++---- Resources/Locale/en-US/mass-media/news-ui.ftl | 2 + .../Machines/Computers/computers.yml | 2 + 7 files changed, 70 insertions(+), 26 deletions(-) diff --git a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml index 528cbef31a7b4f..2da84e9eb1e92a 100644 --- a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml +++ b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml @@ -1,18 +1,26 @@ - - - - - - - - + + + + + + + + + + + + + + +